Merge branch 'develop'

Author: RoyXiang

README.md

@@ -9,6 +9,7 @@ the performance of a low-end server.
 2. Cross-device response caching by client type
 3. Disable transcoding by forcing direct play/stream
 4. Redirect web app to [official one](https://app.plex.tv/desktop)
+5. [Plaxt](https://github.com/XanderStrike/goplaxt) integration
 
 ## Prerequisites
 
@@ -31,13 +32,9 @@ env CGO_ENABLED=0 go install -trimpath -ldflags="-s -w" github.com/RoyXiang/plex
      * If you need a cache layer, set a value for it
    - `PLEX_TOKEN` (Optional, if you need it, see [here](https://support.plex.tv/articles/204059436-finding-an-authentication-token-x-plex-token/))
      * It is used to receive notifications from Plex Media Server
-     * Currently, notifications are used to flush the cache of metadata
-   - `PLAXT_BASEURL` (Optional)
-     * Set it only if you run an instance of [plaxt](https://github.com/RoyXiang/goplaxt/releases) (forked version)
-     * Or, you can set it to [my hosted one](https://plaxt.royxiang.me), e.g. `https://plaxt.royxiang.me`
-     * Currently, it is finally used to sync the realtime playback progress with [Trakt](https://trakt.tv/)
+     * Notifications are used to flush the cache of metadata
+   - `PLAXT_URL` (Optional, e.g. `https://plaxt.astandke.com/api?id=generate-your-own-silly`)
+     * `PLEX_TOKEN` is required
+     * Set it if you run an instance of [Plaxt](https://github.com/XanderStrike/goplaxt)
+     * Or, you can set it to [the official one](https://plaxt.astandke.com/)
 2. Run the program
-
-## TODO
-
-- [ ] Native [Trakt](https://trakt.tv/) integration

go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.5.0
 	github.com/jrudio/go-plex-client v0.0.0-20220106065909-9e1d590b99aa
+	github.com/xanderstrike/plexhooks v0.0.0-20200926011736-c63bcd35fe3e
 )
 
 require (
@@ -16,4 +17,4 @@ require (
 	github.com/google/uuid v1.3.0 // indirect
 )
 
-replace github.com/jrudio/go-plex-client v0.0.0-20220106065909-9e1d590b99aa => github.com/RoyXiang/go-plex-client v0.0.0-20220221154622-936c609dd907
+replace github.com/jrudio/go-plex-client v0.0.0-20220106065909-9e1d590b99aa => github.com/RoyXiang/go-plex-client v0.0.0-20220223140842-7433de7e9b77

go.sum

@@ -1,8 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/RoyXiang/go-plex-client v0.0.0-20220221154622-936c609dd907 h1:R1HVInXY+cYDfNx27G3/olkiDfYzsm+N573tUKspBIY=
-github.com/RoyXiang/go-plex-client v0.0.0-20220221154622-936c609dd907/go.mod h1:NICqgLUxSYsDHh3n+m6xomGmRbqLxBcN4D7Jb9Z6LJ0=
+github.com/RoyXiang/go-plex-client v0.0.0-20220223140842-7433de7e9b77 h1:GVtLzX8S4rd6u9OflS/huI2ilbXVsxSpjipLtx/Jm2c=
+github.com/RoyXiang/go-plex-client v0.0.0-20220223140842-7433de7e9b77/go.mod h1:NICqgLUxSYsDHh3n+m6xomGmRbqLxBcN4D7Jb9Z6LJ0=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
@@ -101,6 +101,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
+github.com/xanderstrike/plexhooks v0.0.0-20200926011736-c63bcd35fe3e h1:IeBBs3KadFYmbWcRw/qBuM3bscr2iKC1hYBr8GS5Gps=
+github.com/xanderstrike/plexhooks v0.0.0-20200926011736-c63bcd35fe3e/go.mod h1:IXlzovfjAZX8O7nzPwCiYe2T0i/0enZzzqkvVq8N02M=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

handler/const.go

@@ -12,6 +12,7 @@ const (
 	headerPageSize       = "X-Plex-Container-Size"
 	headerPageStart      = "X-Plex-Container-Start"
 	headerToken          = "X-Plex-Token"
+	headerUserId         = "X-Plex-User-Id"
 	headerAccept         = "Accept"
 	headerAcceptLanguage = "Accept-Language"
 	headerCacheControl   = "Cache-Control"
@@ -32,4 +33,12 @@ const (
 
 	contentTypeAny = "*/*"
 	contentTypeXml = "xml"
+
+	watchedThreshold = 90
+)
+
+const (
+	sessionUnplayed sessionStatus = iota
+	sessionPlaying
+	sessionWatched
 )

handler/main.go

@@ -16,15 +16,17 @@ var (
 	plexClient  *PlexClient
 	redisClient *redis.Client
 
+	emptyStruct = struct{}{}
+
 	mu sync.RWMutex
 	ml common.MultipleLock
 )
 
 func init() {
 	plexClient = NewPlexClient(PlexConfig{
-		BaseUrl:      os.Getenv("PLEX_BASEURL"),
-		Token:        os.Getenv("PLEX_TOKEN"),
-		PlaxtBaseUrl: os.Getenv("PLAXT_BASEURL"),
+		BaseUrl:  os.Getenv("PLEX_BASEURL"),
+		Token:    os.Getenv("PLEX_TOKEN"),
+		PlaxtUrl: os.Getenv("PLAXT_URL"),
 	})
 	if plexClient == nil {
 		log.Fatalln("Please configure PLEX_BASEURL as a valid URL at first")
@@ -49,9 +51,8 @@ func NewRouter() http.Handler {
 	r.Use(trafficMiddleware)
 
 	if redisClient != nil {
-		r.Path("/:/eventsource/notifications").Handler(plexClient)
-		r.Path("/:/timeline").Handler(plexClient)
-		r.Path("/:/websockets/notifications").Handler(plexClient)
+		// bypass cache
+		r.PathPrefix("/:/").Handler(plexClient)
 		r.PathPrefix("/library/parts/").Handler(plexClient)
 
 		staticRouter := r.Methods(http.MethodGet).Subrouter()

handler/middleware.go

@@ -12,6 +12,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/go-chi/chi/v5/middleware"
 )
 
 var (
@@ -146,13 +148,13 @@ func cacheMiddleware(next http.Handler) http.Handler {
 				resp, _ = http.ReadResponse(reader, r)
 			}
 			if resp == nil {
-				nw := httptest.NewRecorder()
+				nw := middleware.NewWrapResponseWriter(httptest.NewRecorder(), r.ProtoMajor)
 				next.ServeHTTP(nw, r)
-				resp = nw.Result()
+				resp = nw.Unwrap().(*httptest.ResponseRecorder).Result()
 				defer func() {
 					w.Header().Set(headerCacheStatus, "MISS")
 					w.WriteHeader(resp.StatusCode)
-					_, _ = w.Write(nw.Body.Bytes())
+					_, _ = w.Write(nw.Unwrap().(*httptest.ResponseRecorder).Body.Bytes())
 					if resp.StatusCode == http.StatusOK {
 						writeToCache(cacheKey, resp, info.Ttl)
 					}
@@ -185,7 +187,7 @@ func cacheMiddleware(next http.Handler) http.Handler {
 			}
 			userId := plexClient.GetUserId(token)
 			if userId > 0 {
-				params.Set("X-Plex-User-Id", strconv.Itoa(userId))
+				params.Set(headerUserId, strconv.Itoa(userId))
 				params.Set(headerAccept, getAcceptContentType(r))
 			} else {
 				params.Set(headerToken, token)