diff --git a/cmd/server/router.go b/cmd/server/router.go index 7c37bb5..de59636 100644 --- a/cmd/server/router.go +++ b/cmd/server/router.go @@ -53,6 +53,7 @@ func buildRouter(cfg *config.Config, logger *zap.Logger, svc *service.Container) // comes from root, which is either the compiled-in SPA or an on-disk web dir. func serveSPA(r *gin.Engine, root fs.FS) { assets := r.Group("/assets") + assets.Use(middleware.GzipStatic()) assets.Use(func(c *gin.Context) { c.Header("Cache-Control", "public, max-age=31536000, immutable") c.Next() @@ -69,7 +70,7 @@ func serveSPA(r *gin.Engine, root fs.FS) { r.GET(rootFile, serveFSFile(root, name)) r.HEAD(rootFile, serveFSFile(root, name)) } - r.NoRoute(func(c *gin.Context) { + r.NoRoute(middleware.GzipStatic(), func(c *gin.Context) { path := c.Request.URL.Path if shouldBypassSPAFallback(path) { c.Status(http.StatusNotFound) diff --git a/go.mod b/go.mod index cb2b967..23b85d9 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,8 @@ go 1.25.0 require ( github.com/aliyun/alibabacloud-oss-go-sdk-v2 v1.5.2 github.com/fsnotify/fsnotify v1.7.0 - github.com/gin-gonic/gin v1.9.1 + github.com/gin-contrib/gzip v1.2.6 + github.com/gin-gonic/gin v1.12.0 github.com/glebarez/sqlite v1.11.0 github.com/golang-jwt/jwt/v5 v5.2.0 github.com/google/uuid v1.6.0 @@ -13,11 +14,11 @@ require ( github.com/redis/go-redis/v9 v9.7.0 github.com/shirou/gopsutil/v3 v3.24.5 github.com/spf13/viper v1.18.2 - github.com/stretchr/testify v1.9.0 + github.com/stretchr/testify v1.11.1 github.com/ulikunitz/xz v0.5.12 go.uber.org/zap v1.27.0 - golang.org/x/crypto v0.21.0 - golang.org/x/sys v0.20.0 + golang.org/x/crypto v0.48.0 + golang.org/x/sys v0.41.0 golang.org/x/time v0.15.0 gopkg.in/yaml.v3 v3.0.1 gorm.io/driver/postgres v1.5.7 @@ -25,20 +26,23 @@ require ( ) require ( - github.com/bytedance/sonic v1.9.1 // indirect + github.com/bytedance/gopkg v0.1.3 // indirect + github.com/bytedance/sonic v1.15.0 // indirect + github.com/bytedance/sonic/loader v0.5.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect + github.com/cloudwego/base64x v0.1.6 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/dustin/go-humanize v1.0.1 // indirect - github.com/gabriel-vasile/mimetype v1.4.2 // indirect - github.com/gin-contrib/sse v0.1.0 // indirect + github.com/gabriel-vasile/mimetype v1.4.12 // indirect + github.com/gin-contrib/sse v1.1.0 // indirect github.com/glebarez/go-sqlite v1.21.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.14.0 // indirect - github.com/goccy/go-json v0.10.2 // indirect + github.com/go-playground/validator/v10 v10.30.1 // indirect + github.com/goccy/go-json v0.10.5 // indirect + github.com/goccy/go-yaml v1.19.2 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect @@ -46,17 +50,19 @@ require ( github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/cpuid/v2 v2.2.4 // indirect - github.com/leodido/go-urn v1.2.4 // indirect + github.com/klauspost/cpuid/v2 v2.3.0 // indirect + github.com/leodido/go-urn v1.4.0 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/magiconair/properties v1.8.7 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pelletier/go-toml/v2 v2.1.0 // indirect + github.com/pelletier/go-toml/v2 v2.2.4 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect + github.com/quic-go/qpack v0.6.0 // indirect + github.com/quic-go/quic-go v0.59.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect @@ -69,14 +75,15 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/ugorji/go/codec v1.2.11 // indirect + github.com/ugorji/go/codec v1.3.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.mongodb.org/mongo-driver/v2 v2.5.0 // indirect go.uber.org/multierr v1.10.0 // indirect - golang.org/x/arch v0.3.0 // indirect + golang.org/x/arch v0.22.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect - golang.org/x/net v0.21.0 // indirect - golang.org/x/text v0.20.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect + golang.org/x/net v0.51.0 // indirect + golang.org/x/text v0.35.0 // indirect + google.golang.org/protobuf v1.36.10 // indirect gopkg.in/ini.v1 v1.67.0 // indirect modernc.org/libc v1.22.5 // indirect modernc.org/mathutil v1.5.0 // indirect diff --git a/go.sum b/go.sum index d574336..1d6b93c 100644 --- a/go.sum +++ b/go.sum @@ -4,14 +4,16 @@ github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= -github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= -github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s= -github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= +github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M= +github.com/bytedance/gopkg v0.1.3/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM= +github.com/bytedance/sonic v1.15.0 h1:/PXeWFaR5ElNcVE84U0dOHjiMHQOwNIx3K4ymzh/uSE= +github.com/bytedance/sonic v1.15.0/go.mod h1:tFkWrPz0/CUCLEF4ri4UkHekCIcdnkqXw9VduqpJh0k= +github.com/bytedance/sonic/loader v0.5.0 h1:gXH3KVnatgY7loH5/TkeVyXPfESoqSBSBEiDd5VjlgE= +github.com/bytedance/sonic/loader v0.5.0/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= -github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= -github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= +github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M= +github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -24,12 +26,14 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= -github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= -github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= -github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= -github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= +github.com/gabriel-vasile/mimetype v1.4.12 h1:e9hWvmLYvtp846tLHam2o++qitpguFiYCKbn0w9jyqw= +github.com/gabriel-vasile/mimetype v1.4.12/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= +github.com/gin-contrib/gzip v1.2.6 h1:OtN8DplD5DNZCSLAnQ5HxRkD2qZ5VU+JhOrcfJrcRvg= +github.com/gin-contrib/gzip v1.2.6/go.mod h1:BQy8/+JApnRjAVUplSGZiVtD2k8GmIE2e9rYu/hLzzU= +github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w= +github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM= +github.com/gin-gonic/gin v1.12.0 h1:b3YAbrZtnf8N//yjKeU2+MQsh2mY5htkZidOM7O0wG8= +github.com/gin-gonic/gin v1.12.0/go.mod h1:VxccKfsSllpKshkBWgVgRniFFAzFb9csfngsqANjnLc= github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo= github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k= github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw= @@ -42,17 +46,17 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js= -github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= -github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= -github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/go-playground/validator/v10 v10.30.1 h1:f3zDSN/zOma+w6+1Wswgd9fLkdwy06ntQJp0BBvFG0w= +github.com/go-playground/validator/v10 v10.30.1/go.mod h1:oSuBIQzuJxL//3MelwSLD5hc2Tu889bF0Idm9Dg26cM= +github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= +github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM= +github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw= github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= @@ -74,21 +78,20 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= -github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= +github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= -github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -96,20 +99,24 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= -github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= +github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8= +github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII= +github.com/quic-go/quic-go v0.59.0 h1:OLJkp1Mlm/aS7dpKgTc6cnpynnD2Xg7C1pwL6vy/SAw= +github.com/quic-go/quic-go v0.59.0/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU= github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E= github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= @@ -133,15 +140,15 @@ github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMV github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= @@ -150,43 +157,44 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= -github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= -github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/ugorji/go/codec v1.3.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY= +github.com/ugorji/go/codec v1.3.1/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc= github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.mongodb.org/mongo-driver/v2 v2.5.0 h1:yXUhImUjjAInNcpTcAlPHiT7bIXhshCTL3jVBkF3xaE= +go.mongodb.org/mongo-driver/v2 v2.5.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y= +go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU= go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k= -golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/arch v0.22.0 h1:c/Zle32i5ttqRXjdLyyHZESLD/bB90DCU1g9l/0YBDI= +golang.org/x/arch v0.22.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A= +golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= +golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo= +golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= -golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= +golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= +golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= +golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U= golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= +google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -207,4 +215,3 @@ modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds= modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM= modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk= -rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 7121661..8507242 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -43,8 +43,8 @@ func TestLoadDefaults(t *testing.T) { if cfg.Cache.RedisPrefix != "mebox" { t.Fatalf("expected default redis prefix, got %q", cfg.Cache.RedisPrefix) } - if cfg.Cache.MediaTTLSeconds != 15 { - t.Fatalf("expected default media cache ttl 15, got %d", cfg.Cache.MediaTTLSeconds) + if cfg.Cache.MediaTTLSeconds != 90 { + t.Fatalf("expected default media cache ttl 90, got %d", cfg.Cache.MediaTTLSeconds) } if cfg.Search.Index != "mebox_media" { t.Fatalf("expected default search index, got %q", cfg.Search.Index) diff --git a/internal/config/defaults.go b/internal/config/defaults.go index b296f06..b7a3d6e 100644 --- a/internal/config/defaults.go +++ b/internal/config/defaults.go @@ -47,7 +47,7 @@ func setDefaults(v *viper.Viper) { v.SetDefault("cache.cleanup_interval_min", 60) v.SetDefault("cache.redis_url", "") v.SetDefault("cache.redis_prefix", "mebox") - v.SetDefault("cache.media_ttl_seconds", 15) + v.SetDefault("cache.media_ttl_seconds", 90) v.SetDefault("search.backend", "") v.SetDefault("search.opensearch_url", "") diff --git a/internal/config/normalize.go b/internal/config/normalize.go index 4d7d1b1..d811c9b 100644 --- a/internal/config/normalize.go +++ b/internal/config/normalize.go @@ -51,7 +51,7 @@ func (c *Config) normalize() error { c.Cache.RedisPrefix = "mebox" } if c.Cache.MediaTTLSeconds < 1 { - c.Cache.MediaTTLSeconds = 15 + c.Cache.MediaTTLSeconds = 90 } c.Search.Backend = strings.ToLower(strings.TrimSpace(c.Search.Backend)) if c.Search.Index == "" { diff --git a/internal/database/schema_migration.go b/internal/database/schema_migration.go index 424b5e6..896ae5c 100644 --- a/internal/database/schema_migration.go +++ b/internal/database/schema_migration.go @@ -60,8 +60,16 @@ func ensurePostgresColumnCompatibility(db *gorm.DB) error { func ensurePerformanceIndexes(db *gorm.DB) error { statements := []string{ + // 完整多级排序索引：媒体库分页与首页预览的 ORDER BY + // (release_date, year, updated_at, created_at, id) DESC 与索引列完全一致， + // LIMIT 分页沿索引顺序直取，免去对整库行做临时 B-tree 排序。 + `CREATE INDEX IF NOT EXISTS idx_media_library_recent_active ON media(library_id, release_date DESC, year DESC, updated_at DESC, created_at DESC, id DESC) WHERE deleted_at IS NULL`, + // 计数覆盖索引：首页 CountByLibraries 的 GROUP BY library_id + nsfw 谓词 + // 全部落在索引键/部分索引条件上，纯索引扫描即可完成，不回表。 + `CREATE INDEX IF NOT EXISTS idx_media_library_nsfw_active ON media(library_id, nsfw) WHERE deleted_at IS NULL`, + // 旧的两键前缀索引被上面的完整排序索引完全覆盖，删除以降低写放大。 + `DROP INDEX IF EXISTS idx_media_library_release_active`, `CREATE INDEX IF NOT EXISTS idx_media_library_created_active ON media(library_id, created_at DESC) WHERE deleted_at IS NULL`, - `CREATE INDEX IF NOT EXISTS idx_media_library_release_active ON media(library_id, release_date DESC, year DESC) WHERE deleted_at IS NULL`, `CREATE INDEX IF NOT EXISTS idx_media_library_episode_active ON media(library_id, season_num, episode_num, created_at DESC) WHERE deleted_at IS NULL`, `CREATE INDEX IF NOT EXISTS idx_media_library_root_active ON media(library_id, library_root_id) WHERE deleted_at IS NULL`, `CREATE INDEX IF NOT EXISTS idx_media_series_active ON media(series_id, season_num, episode_num) WHERE deleted_at IS NULL`, diff --git a/internal/handler/handler.go b/internal/handler/handler.go index f8e3fc0..b09cad2 100644 --- a/internal/handler/handler.go +++ b/internal/handler/handler.go @@ -9,12 +9,14 @@ import ( "go.uber.org/zap" "github.com/truewhile/MeBox/internal/config" + "github.com/truewhile/MeBox/internal/middleware" "github.com/truewhile/MeBox/internal/service" ) // Register attaches every API route to the engine. func Register(r *gin.Engine, cfg *config.Config, log *zap.Logger, svc *service.Container) { api := r.Group("/api") + api.Use(middleware.GzipAPI()) { api.GET("/health", healthCheck) api.GET("/version", versionInfo) diff --git a/internal/middleware/gzip.go b/internal/middleware/gzip.go new file mode 100644 index 0000000..c8b4f1e --- /dev/null +++ b/internal/middleware/gzip.go @@ -0,0 +1,47 @@ +package middleware + +import ( + "github.com/gin-contrib/gzip" + "github.com/gin-gonic/gin" +) + +// gzipExcludedExtensions 已经是压缩格式（图片/字体/媒体/归档）的响应体， +// 再 gzip 只浪费 CPU 不省流量。 +var gzipExcludedExtensions = []string{ + ".png", ".gif", ".jpeg", ".jpg", ".webp", ".avif", ".ico", ".svg", + ".woff", ".woff2", ".ttf", ".otf", + ".mp4", ".mkv", ".webm", ".ts", ".m4s", ".m3u8", + ".mp3", ".flac", ".aac", ".ogg", + ".zip", ".gz", ".xz", ".7z", ".rar", +} + +// apiGzipExcludedPrefixes 大文件流式传输（Range 语义）与 WS/SSE 长连接 +// 不参与 gzip：压缩会破坏 Range / 逐块推送语义。 +var apiGzipExcludedPrefixes = []string{ + "/api/stream/", + "/api/hls/", + "/api/img", + "/api/subtitles/", + "/api/strm/play/", + "/api/ws", + "/api/events", +} + +// GzipAPI 压缩 /api 下的 JSON 响应（媒体列表动辄数 MB，压缩率 85%+）。 +// gin-contrib/gzip 的路径排除是前缀匹配，且会自动校验 Accept-Encoding +// 与 Connection: Upgrade（WebSocket 安全）。 +func GzipAPI() gin.HandlerFunc { + return gzip.Gzip( + gzip.DefaultCompression, + gzip.WithExcludedExtensions(gzipExcludedExtensions), + gzip.WithExcludedPaths(apiGzipExcludedPrefixes), + ) +} + +// GzipStatic 压缩 SPA 静态资源（JS/CSS/HTML 是构建产物的大头）。 +func GzipStatic() gin.HandlerFunc { + return gzip.Gzip( + gzip.DefaultCompression, + gzip.WithExcludedExtensions(gzipExcludedExtensions), + ) +} diff --git a/internal/middleware/gzip_test.go b/internal/middleware/gzip_test.go new file mode 100644 index 0000000..fca56dc --- /dev/null +++ b/internal/middleware/gzip_test.go @@ -0,0 +1,84 @@ +package middleware + +import ( + "net/http" + "net/http/httptest" + "strings" + "testing" + + "github.com/gin-gonic/gin" +) + +func newGzipTestRouter() *gin.Engine { + gin.SetMode(gin.TestMode) + router := gin.New() + api := router.Group("/api") + api.Use(GzipAPI()) + api.GET("/libraries", func(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{"items": strings.Repeat("mebox", 200)}) + }) + api.GET("/stream/:id", func(c *gin.Context) { + c.String(http.StatusOK, strings.Repeat("video-bytes", 200)) + }) + router.GET("/assets/app.js", GzipStatic(), func(c *gin.Context) { + c.Data(http.StatusOK, "text/javascript", []byte(strings.Repeat("console.log(1);", 200))) + }) + return router +} + +func TestGzipAPICompressesJSONWhenAccepted(t *testing.T) { + router := newGzipTestRouter() + + req := httptest.NewRequest(http.MethodGet, "/api/libraries", nil) + req.Header.Set("Accept-Encoding", "gzip") + w := httptest.NewRecorder() + router.ServeHTTP(w, req) + + if w.Code != http.StatusOK { + t.Fatalf("status = %d, want 200", w.Code) + } + if got := w.Header().Get("Content-Encoding"); got != "gzip" { + t.Fatalf("Content-Encoding = %q, want gzip", got) + } + if raw := strings.Repeat("mebox", 200); w.Body.Len() >= len(raw) { + t.Fatalf("body not compressed: len = %d, raw = %d", w.Body.Len(), len(raw)) + } +} + +func TestGzipAPISkipsWhenNotAccepted(t *testing.T) { + router := newGzipTestRouter() + + req := httptest.NewRequest(http.MethodGet, "/api/libraries", nil) + w := httptest.NewRecorder() + router.ServeHTTP(w, req) + + if got := w.Header().Get("Content-Encoding"); got == "gzip" { + t.Fatal("Content-Encoding should not be gzip without Accept-Encoding") + } +} + +func TestGzipAPIExcludesStreamPath(t *testing.T) { + router := newGzipTestRouter() + + req := httptest.NewRequest(http.MethodGet, "/api/stream/abc", nil) + req.Header.Set("Accept-Encoding", "gzip") + w := httptest.NewRecorder() + router.ServeHTTP(w, req) + + if got := w.Header().Get("Content-Encoding"); got == "gzip" { + t.Fatal("stream path must not be gzipped (Range semantics)") + } +} + +func TestGzipStaticCompressesAssets(t *testing.T) { + router := newGzipTestRouter() + + req := httptest.NewRequest(http.MethodGet, "/assets/app.js", nil) + req.Header.Set("Accept-Encoding", "gzip") + w := httptest.NewRecorder() + router.ServeHTTP(w, req) + + if got := w.Header().Get("Content-Encoding"); got != "gzip" { + t.Fatalf("Content-Encoding = %q, want gzip for static assets", got) + } +} diff --git a/internal/repository/media_repository_upsert.go b/internal/repository/media_repository_upsert.go index 21d70bf..df4ee41 100644 --- a/internal/repository/media_repository_upsert.go +++ b/internal/repository/media_repository_upsert.go @@ -23,12 +23,34 @@ import ( // 永远捞不到数据。 func (r *MediaRepository) Upsert(ctx context.Context, m *model.Media) error { return withSQLiteBusyRetry(ctx, func() error { - return r.upsert(ctx, m) + return r.upsertWithDB(ctx, r.db, m) }) } -func (r *MediaRepository) upsert(ctx context.Context, m *model.Media) error { - existing, created, err := r.findOrCreateMediaByPath(ctx, m) +// UpsertBatch 在单个事务里逐条执行 Upsert：扫描一批只提交（fsync）一次， +// 而不是每条一个隐式事务。任一条目落库失败不影响批内已成功的条目—— +// 事务回滚后由调用方退回逐条 Upsert 兜底。 +func (r *MediaRepository) UpsertBatch(ctx context.Context, items []*model.Media) error { + if len(items) == 0 { + return nil + } + return withSQLiteBusyRetry(ctx, func() error { + return r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error { + for _, m := range items { + if m == nil { + continue + } + if err := r.upsertWithDB(ctx, tx, m); err != nil { + return err + } + } + return nil + }) + }) +} + +func (r *MediaRepository) upsertWithDB(ctx context.Context, db *gorm.DB, m *model.Media) error { + existing, created, err := r.findOrCreateMediaByPath(ctx, db, m) if err != nil { return err } @@ -38,20 +60,20 @@ func (r *MediaRepository) upsert(ctx context.Context, m *model.Media) error { } updates := mediaUpsertUpdates(existing, *m) - return r.applyMediaUpsertUpdates(ctx, m, existing, updates) + return r.applyMediaUpsertUpdates(ctx, db, m, existing, updates) } -func (r *MediaRepository) findOrCreateMediaByPath(ctx context.Context, m *model.Media) (model.Media, bool, error) { +func (r *MediaRepository) findOrCreateMediaByPath(ctx context.Context, db *gorm.DB, m *model.Media) (model.Media, bool, error) { var existing model.Media - err := r.db.WithContext(ctx).Unscoped().Where("path = ?", m.Path).First(&existing).Error + err := db.WithContext(ctx).Unscoped().Where("path = ?", m.Path).First(&existing).Error if errors.Is(err, gorm.ErrRecordNotFound) { // 新行：保证 scrape_status 走 GORM default:pending（即留空让数据库填）。 if m.ScrapeStatus == "" { m.ScrapeStatus = "pending" } - if createErr := r.db.WithContext(ctx).Create(m).Error; createErr == nil { + if createErr := db.WithContext(ctx).Create(m).Error; createErr == nil { return *m, true, nil - } else if retryErr := r.db.WithContext(ctx).Unscoped().Where("path = ?", m.Path).First(&existing).Error; retryErr != nil { + } else if retryErr := db.WithContext(ctx).Unscoped().Where("path = ?", m.Path).First(&existing).Error; retryErr != nil { return model.Media{}, false, createErr } } @@ -237,12 +259,12 @@ func setNonEmptyMediaString(updates map[string]any, key, current, next string) { } } -func (r *MediaRepository) applyMediaUpsertUpdates(ctx context.Context, m *model.Media, existing model.Media, updates map[string]any) error { +func (r *MediaRepository) applyMediaUpsertUpdates(ctx context.Context, db *gorm.DB, m *model.Media, existing model.Media, updates map[string]any) error { if len(updates) == 0 { *m = existing return nil } - if err := r.db.WithContext(ctx).Unscoped().Model(&model.Media{}). + if err := db.WithContext(ctx).Unscoped().Model(&model.Media{}). Where("id = ?", existing.ID).Updates(updates).Error; err != nil { return err } diff --git a/internal/service/emby_items_cache.go b/internal/service/emby_items_cache.go index 6c7c3df..b8d6454 100644 --- a/internal/service/emby_items_cache.go +++ b/internal/service/emby_items_cache.go @@ -49,7 +49,7 @@ func (e *EmbyService) embyLatestCacheKey(userID, parentID string, limit int) str func (e *EmbyService) mediaCacheTTLSeconds() int { if e == nil || e.cfg == nil || e.cfg.Cache.MediaTTLSeconds < 1 { - return 15 + return 90 } return e.cfg.Cache.MediaTTLSeconds } diff --git a/internal/service/media_cache.go b/internal/service/media_cache.go index b42fe7b..b590439 100644 --- a/internal/service/media_cache.go +++ b/internal/service/media_cache.go @@ -7,6 +7,7 @@ import ( "fmt" "sort" "strings" + "time" "github.com/truewhile/MeBox/internal/model" "github.com/truewhile/MeBox/internal/repository" @@ -70,11 +71,60 @@ func (s *MediaService) seriesCardsCacheKey(libraryID string, visibility MediaVis func (s *MediaService) mediaCacheTTLSeconds() int { if s == nil || s.cfg == nil || s.cfg.Cache.MediaTTLSeconds < 1 { - return 15 + return 90 } return s.cfg.Cache.MediaTTLSeconds } +// mediaObjectTTL 对象缓存与字节缓存同 TTL，失效同走 invalidateMediaCache +// 的 DeletePrefix("media:")（对象存储一并清除）。 +func (s *MediaService) mediaObjectTTL() time.Duration { + return time.Duration(s.mediaCacheTTLSeconds()) * time.Second +} + +func hashObjectCacheKey(parts []string) string { + sum := sha1.Sum([]byte(strings.Join(parts, "|"))) + return hex.EncodeToString(sum[:]) +} + +// mediaGroupedRowsCacheKey 版本分组源行（已挂库元数据）的对象缓存。 +func (s *MediaService) mediaGroupedRowsCacheKey(libraryID string, libraryIDs []string, filter repository.MediaQueryFilter) string { + libs := append([]string(nil), libraryIDs...) + sort.Strings(libs) + allowed := append([]string(nil), filter.AllowedLibraryIDs...) + hidden := append([]string(nil), filter.HiddenLibraryIDs...) + sort.Strings(allowed) + sort.Strings(hidden) + return "media:obj:grouped-rows:" + hashObjectCacheKey([]string{ + libraryID, + strings.Join(libs, ","), + fmt.Sprintf("%t", filter.IncludeNSFW), + strings.Join(allowed, ","), + strings.Join(hidden, ","), + }) +} + +// libraryRowsCacheKey 整库可见行 + 预计算剧集索引的对象缓存（剧集卡片/剧集 +// 列表共用一次 SQL 加载与一次 key 解析）。 +func (s *MediaService) libraryRowsCacheKey(libraryID string, visibility MediaVisibility) string { + allowed := append([]string(nil), visibility.AllowedLibraryIDs...) + hidden := append([]string(nil), visibility.HiddenLibraryIDs...) + sort.Strings(allowed) + sort.Strings(hidden) + return "media:obj:library-rows:" + hashObjectCacheKey([]string{ + libraryID, + fmt.Sprintf("%t", visibility.IncludeNSFW), + strings.Join(allowed, ","), + strings.Join(hidden, ","), + }) +} + +// libraryCardsObjectKey 系列卡片结果的对象缓存（与 seriesCardsCacheKey 同维度， +// 换独立前缀避免与字节缓存 key 冲突）。 +func (s *MediaService) libraryCardsObjectKey(libraryID string, visibility MediaVisibility) string { + return s.seriesCardsCacheKey(libraryID, visibility) + ":obj" +} + func (s *MediaService) invalidateMediaCache(ctx context.Context) { if s != nil && s.cache != nil { s.cache.DeletePrefix(ctx, "media:") diff --git a/internal/service/media_listing.go b/internal/service/media_listing.go index 5b0ad78..f44ec31 100644 --- a/internal/service/media_listing.go +++ b/internal/service/media_listing.go @@ -73,11 +73,15 @@ func (s *MediaService) listMediaVisibleForGrouping(ctx context.Context, libraryI AllowedLibraryIDs: visibility.AllowedLibraryIDs, HiddenLibraryIDs: visibility.HiddenLibraryIDs, } - cacheKey := s.mediaListCacheKey(libraryID, libraryIDs, 0, maxMediaSearchLimit, filter) + ":group-source" - var cached mediaListCacheValue - if s.cache != nil && s.cache.GetJSON(ctx, cacheKey, &cached) { - s.attachLibraryMetadata(ctx, cached.Items) - return cached.Items, nil + cacheKey := s.mediaGroupedRowsCacheKey(libraryID, libraryIDs, filter) + if s.cache != nil { + if cachedObj, ok := s.cache.GetObject(cacheKey); ok { + if cached, ok := cachedObj.([]model.Media); ok { + // 对象缓存中的切片视为不可变；attachLibraryMetadata 会在填充时 + // 执行过，命中路径直接返回副本即可（调用方只读）。 + return cached, nil + } + } } items, total, err := s.repo.Media.ListByLibrariesFiltered(ctx, libraryIDs, 0, maxMediaSearchLimit, filter) if err != nil { @@ -91,7 +95,7 @@ func (s *MediaService) listMediaVisibleForGrouping(ctx context.Context, libraryI } s.attachLibraryMetadata(ctx, items) if s.cache != nil { - s.cache.SetJSON(ctx, cacheKey, mediaListCacheValue{Items: items, Total: total}, time.Duration(s.mediaCacheTTLSeconds())*time.Second) + s.cache.SetObject(cacheKey, items, s.mediaObjectTTL()) } return items, nil } diff --git a/internal/service/media_series.go b/internal/service/media_series.go index 423e5a3..fb71855 100644 --- a/internal/service/media_series.go +++ b/internal/service/media_series.go @@ -17,6 +17,15 @@ type seriesCardsCacheValue struct { Total int64 `json:"total"` } +// libraryRowsCacheValue 整库可见行 + 预计算索引的对象缓存。填充时一次性完成 +// 整库 SQL 加载与 series key 解析，之后剧集卡片、剧集列表、媒体详情剧集 +// 共享这份结果：命中路径零 SQL、零逐行 key 解析。Rows/Episodes 视为不可变。 +type libraryRowsCacheValue struct { + Rows []model.Media + Resolver mediaSeriesKeyResolver + Episodes map[string][]model.Media +} + type SeriesCard struct { Key string `json:"key"` Rep model.Media `json:"rep"` @@ -29,24 +38,59 @@ type seriesCardGroup struct { latest time.Time } -func (s *MediaService) ListLibrarySeriesCards(ctx context.Context, libraryID string, visibility MediaVisibility) ([]SeriesCard, int64, error) { - visibility = ExpandMediaVisibilityForMergedCloudLibraries(ctx, s.repo, visibility) - cacheKey := s.seriesCardsCacheKey(libraryID, visibility) - var cached seriesCardsCacheValue - if s.cache != nil && s.cache.GetJSON(ctx, cacheKey, &cached) { - return cached.Cards, cached.Total, nil +// libraryRowsWithIndex 返回整库行与预计算剧集索引（带对象缓存）。 +func (s *MediaService) libraryRowsWithIndex(ctx context.Context, libraryID string, visibility MediaVisibility) (*libraryRowsCacheValue, error) { + cacheKey := s.libraryRowsCacheKey(libraryID, visibility) + if s.cache != nil { + if obj, ok := s.cache.GetObject(cacheKey); ok { + if cached, ok := obj.(*libraryRowsCacheValue); ok { + return cached, nil + } + } } rows, _, err := s.listAllMediaVisible(ctx, libraryID, visibility) + if err != nil { + return nil, err + } + // listAllMediaVisible 走 ListMediaVisible，行已带库元数据（resolver 的 + // key 计算依赖 DisplayLibraryPath/ID）。 + resolver := newMediaSeriesKeyResolver(rows) + episodes := make(map[string][]model.Media, len(rows)/4+1) + for _, row := range rows { + k := resolver.key(row) + if k == "" { + continue + } + episodes[k] = append(episodes[k], row) + } + value := &libraryRowsCacheValue{Rows: rows, Resolver: resolver, Episodes: episodes} + if s.cache != nil { + s.cache.SetObject(cacheKey, value, s.mediaObjectTTL()) + } + return value, nil +} + +func (s *MediaService) ListLibrarySeriesCards(ctx context.Context, libraryID string, visibility MediaVisibility) ([]SeriesCard, int64, error) { + visibility = ExpandMediaVisibilityForMergedCloudLibraries(ctx, s.repo, visibility) + cacheKey := s.libraryCardsObjectKey(libraryID, visibility) + if s.cache != nil { + if obj, ok := s.cache.GetObject(cacheKey); ok { + if cached, ok := obj.(*seriesCardsCacheValue); ok { + return cached.Cards, cached.Total, nil + } + } + } + rows, err := s.libraryRowsWithIndex(ctx, libraryID, visibility) if err != nil { return nil, 0, err } - cards := groupMediaSeriesCards(rows) + cards := groupMediaSeriesCards(rows.Rows) if cards == nil { cards = []SeriesCard{} } total := int64(len(cards)) if s.cache != nil { - s.cache.SetJSON(ctx, cacheKey, seriesCardsCacheValue{Cards: cards, Total: total}, time.Duration(s.mediaCacheTTLSeconds())*time.Second) + s.cache.SetObject(cacheKey, &seriesCardsCacheValue{Cards: cards, Total: total}, s.mediaObjectTTL()) } return cards, total, nil } @@ -72,17 +116,35 @@ func (s *MediaService) ListRecentSeriesCards(ctx context.Context, limit int, vis } func (s *MediaService) ListLibrarySeriesEpisodes(ctx context.Context, libraryID, key string, visibility MediaVisibility) ([]model.Media, error) { - rows, _, err := s.listAllMediaVisible(ctx, libraryID, visibility) + rows, err := s.libraryRowsWithIndex(ctx, libraryID, visibility) if err != nil { return nil, err } + // 预计算索引命中：O(1) 查找，拷贝后排序避免改动共享缓存。 + if episodes, ok := rows.Episodes[key]; ok && len(episodes) > 0 { + out := make([]model.Media, len(episodes)) + copy(out, episodes) + sortEpisodesForDisplay(out) + return out, nil + } + + // 兜底：索引未命中（如卡片 key 与行缓存短暂跨代），保持原线性匹配逻辑。 + all := rows.Rows out := make([]model.Media, 0) - resolver := newMediaSeriesKeyResolver(rows) - for _, row := range rows { - if resolver.key(row) == key { + for _, row := range all { + if rows.Resolver.key(row) == key { out = append(out, row) } } + if len(out) == 0 { + return []model.Media{}, nil + } + sortEpisodesForDisplay(out) + return out, nil +} + +// sortEpisodesForDisplay 与历史行为一致：季/集号升序，再按入库时间兜底。 +func sortEpisodesForDisplay(out []model.Media) { sort.SliceStable(out, func(i, j int) bool { if out[i].SeasonNum != out[j].SeasonNum { return out[i].SeasonNum < out[j].SeasonNum @@ -92,7 +154,6 @@ func (s *MediaService) ListLibrarySeriesEpisodes(ctx context.Context, libraryID, } return out[i].CreatedAt.Before(out[j].CreatedAt) }) - return out, nil } func (s *MediaService) ListMediaEpisodes(ctx context.Context, mediaID string, visibility MediaVisibility) ([]model.Media, error) { @@ -109,23 +170,22 @@ func (s *MediaService) ListMediaEpisodes(ctx context.Context, mediaID string, vi if target.LibraryID == "" { return []model.Media{*target}, nil } - rows, _, err := s.listAllMediaVisible(ctx, target.LibraryID, visibility) + cache, err := s.libraryRowsWithIndex(ctx, target.LibraryID, visibility) if err != nil { return nil, err } + rows := cache.Rows if len(rows) == 0 { return []model.Media{*target}, nil } - resolver := newMediaSeriesKeyResolver(rows) - targetKey := resolver.key(*target) - - out := make([]model.Media, 0) + var out []model.Media + targetKey := cache.Resolver.key(*target) if targetKey != "" { - for _, row := range rows { - if resolver.key(row) == targetKey { - out = append(out, row) - } + // 预计算索引命中时拷贝，避免改动共享缓存。 + if episodes, ok := cache.Episodes[targetKey]; ok { + out = make([]model.Media, len(episodes)) + copy(out, episodes) } } diff --git a/internal/service/runtime_cache.go b/internal/service/runtime_cache.go index 270531c..81b0c37 100644 --- a/internal/service/runtime_cache.go +++ b/internal/service/runtime_cache.go @@ -20,6 +20,7 @@ type RuntimeCacheService struct { mu sync.RWMutex memory map[string]runtimeCacheItem + obj map[string]runtimeObjectItem limit int } @@ -28,8 +29,18 @@ type runtimeCacheItem struct { expiresAt time.Time } +// runtimeObjectItem 直存 Go 对象，跳过 JSON 编解码。热点路径（整库行、 +// 分组结果）每次请求都要完整反序列化，字节缓存避免了 SQL 却没避免解码； +// 对象缓存命中时零解码零分配。存储的值视为不可变：读取方如需修改必须 +// 自行浅拷贝。仅进程内生效（Redis 只支持字节），多实例部署退化为各实例 +// 独立缓存，与现有内存 L1 语义一致。 +type runtimeObjectItem struct { + value any + expiresAt time.Time +} + func NewRuntimeCacheService(cfg *config.Config, log *zap.Logger) *RuntimeCacheService { - c := &RuntimeCacheService{log: log, memory: map[string]runtimeCacheItem{}, limit: 2048} + c := &RuntimeCacheService{log: log, memory: map[string]runtimeCacheItem{}, obj: map[string]runtimeObjectItem{}, limit: 2048} if cfg == nil { return c } @@ -112,6 +123,50 @@ func (c *RuntimeCacheService) SetJSON(ctx context.Context, key string, value any } } +// GetObject 返回缓存中的对象。返回值不可变：调用方需要修改时必须先自行拷贝。 +func (c *RuntimeCacheService) GetObject(key string) (any, bool) { + if !c.Enabled() || strings.TrimSpace(key) == "" { + return nil, false + } + fullKey := c.key(key) + now := time.Now() + c.mu.RLock() + item, ok := c.obj[fullKey] + c.mu.RUnlock() + if !ok { + return nil, false + } + if now.After(item.expiresAt) { + c.mu.Lock() + delete(c.obj, fullKey) + c.mu.Unlock() + return nil, false + } + return item.value, true +} + +// SetObject 存入一个此后视为不可变的对象。 +func (c *RuntimeCacheService) SetObject(key string, value any, ttl time.Duration) { + if !c.Enabled() || strings.TrimSpace(key) == "" || value == nil || ttl <= 0 { + return + } + fullKey := c.key(key) + now := time.Now() + c.mu.Lock() + defer c.mu.Unlock() + if len(c.obj) >= c.limit { + for k, item := range c.obj { + if now.After(item.expiresAt) || len(c.obj) >= c.limit { + delete(c.obj, k) + } + if len(c.obj) < c.limit { + break + } + } + } + c.obj[fullKey] = runtimeObjectItem{value: value, expiresAt: now.Add(ttl)} +} + func (c *RuntimeCacheService) DeletePrefix(ctx context.Context, prefix string) { if !c.Enabled() || strings.TrimSpace(prefix) == "" { return @@ -190,4 +245,9 @@ func (c *RuntimeCacheService) deleteMemoryPrefix(prefix string) { delete(c.memory, key) } } + for key := range c.obj { + if strings.HasPrefix(key, prefix) { + delete(c.obj, key) + } + } } diff --git a/internal/service/scanner_local_write_batch.go b/internal/service/scanner_local_write_batch.go index ffd4f8e..8f861b2 100644 --- a/internal/service/scanner_local_write_batch.go +++ b/internal/service/scanner_local_write_batch.go @@ -63,6 +63,8 @@ func (b *localMediaWriteBatch) Flush() { return } existingPaths := b.existingPaths(items) + upsertItems := make([]*model.Media, 0, len(items)) + upsertAfter := make([]func(), 0, len(items)) createItems := make([]localMediaWriteItem, 0, len(items)) createMedia := make([]model.Media, 0, len(items)) for _, item := range items { @@ -70,12 +72,16 @@ func (b *localMediaWriteBatch) Flush() { continue } if existingPaths[filepath.Clean(item.media.Path)] { - b.upsertExistingItem(item) + // 已存在行：攒起来在一个事务里逐条 upsert（一批一次提交）。 + after := item.after + upsertItems = append(upsertItems, item.media) + upsertAfter = append(upsertAfter, after) continue } createItems = append(createItems, item) createMedia = append(createMedia, *item.media) } + b.flushUpserts(items, upsertItems, upsertAfter) if len(createMedia) == 0 { b.publish() return @@ -142,6 +148,35 @@ func (b *localMediaWriteBatch) existingPaths(items []localMediaWriteItem) map[st return out } +// flushUpserts 把已存在行的 upsert 攒成一个事务（一次提交/一组 fsync）。 +// 整批失败（如单条数据触发约束）时退回逐条 Upsert，只丢真正坏的那几条。 +func (b *localMediaWriteBatch) flushUpserts(allItems []localMediaWriteItem, upsertItems []*model.Media, upsertAfter []func()) { + if len(upsertItems) == 0 { + return + } + if err := b.scanner.repo.Media.UpsertBatch(b.ctx, upsertItems); err == nil { + b.res.Updated += len(upsertItems) + for _, after := range upsertAfter { + if after != nil { + after() + } + } + return + } else if b.scanner.log != nil { + b.scanner.log.Warn("batch upsert failed; falling back to per-item upsert", + zap.Int("items", len(upsertItems))) + } + // 兜底：按原始顺序找回每个条目的 path/after（两个切片同序但可能含 nil）。 + idx := 0 + for _, item := range allItems { + if item.media == nil || idx >= len(upsertItems) || upsertItems[idx] != item.media { + continue + } + idx++ + b.upsertExistingItem(item) + } +} + func (b *localMediaWriteBatch) upsertExistingItem(item localMediaWriteItem) { if item.media == nil { return diff --git a/web/package-lock.json b/web/package-lock.json index 578c230..3785c2f 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -19,6 +19,7 @@ "react-dom": "^18.3.1", "react-hot-toast": "^2.6.0", "react-router-dom": "^6.23.1", + "react-virtuoso": "^4.18.12", "zustand": "^4.5.2" }, "devDependencies": { @@ -3874,6 +3875,16 @@ "react-dom": ">=16.8" } }, + "node_modules/react-virtuoso": { + "version": "4.18.12", + "resolved": "https://registry.npmjs.org/react-virtuoso/-/react-virtuoso-4.18.12.tgz", + "integrity": "sha512-6c1SnRicSBfG+WnbhcyJUxzDHvvxD3vsux/EpcfVbgB7clyP1Od2r81TAGTgwbL7U2qP889RR4u+CH6WjgpW0g==", + "license": "MIT", + "peerDependencies": { + "react": ">=16 || >=17 || >= 18 || >= 19", + "react-dom": ">=16 || >=17 || >= 18 || >=19" + } + }, "node_modules/read-cache": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", diff --git a/web/package.json b/web/package.json index 8804d70..76d7f9c 100644 --- a/web/package.json +++ b/web/package.json @@ -21,6 +21,7 @@ "react-dom": "^18.3.1", "react-hot-toast": "^2.6.0", "react-router-dom": "^6.23.1", + "react-virtuoso": "^4.18.12", "zustand": "^4.5.2" }, "devDependencies": { diff --git a/web/src/components/LayoutSections.tsx b/web/src/components/LayoutSections.tsx index f64d385..528529d 100644 --- a/web/src/components/LayoutSections.tsx +++ b/web/src/components/LayoutSections.tsx @@ -137,7 +137,7 @@ export function LayoutWorkspace({ routeKey, showMobileBottomNav = false }: Layou } return ( -
+
( + function GridList({ children, style, ...rest }, ref) { + return ( +
+ {children} +
+ ) + }, +) + +const GridItem = forwardRef( + function GridItem({ children, style, ...rest }, ref) { + return ( +
+ {children} +
+ ) + }, +) + +// VirtualMediaGrid 大库性能优化：无论库里有 1 千还是 5 万张卡片， +// 实际挂载的只有视口内及邻近一屏的节点。滚动容器是 Layout 的 +//
（非 window 滚动），通过 customScrollParent 接入； +// 元素尚未挂载时先渲染一屏卡片，挂载后切换为虚拟列表。 +export function VirtualMediaGrid({ + totalCount, + renderItem, +}: { + totalCount: number + renderItem: (index: number) => ReactNode +}) { + const [scrollParent, setScrollParent] = useState(null) + + useEffect(() => { + setScrollParent(document.getElementById('app-main-scroll')) + }, []) + + if (!scrollParent) { + return ( +
+ {Array.from({ length: Math.min(totalCount, FIRST_PAINT_COUNT) }, (_, index) => ( +
{renderItem(index)}
+ ))} +
+ ) + } + + return ( + + ) +} diff --git a/web/src/pages/HomePage.tsx b/web/src/pages/HomePage.tsx index 147ce02..4e9a896 100644 --- a/web/src/pages/HomePage.tsx +++ b/web/src/pages/HomePage.tsx @@ -9,6 +9,7 @@ import { usePinnedLibraries } from '../hooks/usePinnedLibraries' import { sortByPinnedIds } from '../utils/pinnedLibraries' import { ContinueWatchingSection, + ContinueWatchingSkeleton, HomeCarouselSection, HomeEmptyState, HomeLibrariesSection, @@ -23,38 +24,22 @@ export function HomePage() { const [libraries, setLibraries] = useState([]) const [libraryData, setLibraryData] = useState>({}) const [history, setHistory] = useState([]) - const [loading, setLoading] = useState(true) + // 两个请求独立渐进加载：库列表控制整页首屏，播放记录区块自行渲染， + // 避免整页被 Promise.all 里最慢的那个请求拖住。 + const [librariesLoading, setLibrariesLoading] = useState(true) + const [historyLoading, setHistoryLoading] = useState(true) const { pinnedIds } = usePinnedLibraries() useEffect(() => { let cancelled = false - async function load() { - setLoading(true) - try { - const [libs, hist] = await Promise.all([ - libraryAPI - .list({ withPreview: true, previewLimit: 20 }) - .then((rows) => asArray(rows)) - .catch(() => [] as LibraryWithPreview[]), - historyAPI - .continueWatching(12) - .then((rows) => - rows.map( - (row): HistoryItem => ({ - ...row.history, - created_at: '', - updated_at: '', - media: row.media, - }), - ), - ) - .catch(() => [] as HistoryItem[]), - ]) - + libraryAPI + .list({ withPreview: true, previewLimit: 20 }) + .then((rows) => asArray(rows)) + .catch(() => [] as LibraryWithPreview[]) + .then((libs) => { if (cancelled) return setLibraries(libs) - setHistory(hist.filter((h) => h && !h.completed)) const mapData: Record = {} for (const lib of libs) { @@ -65,12 +50,36 @@ export function HomePage() { } } setLibraryData(mapData) - } finally { - if (!cancelled) setLoading(false) - } - } + setLibrariesLoading(false) + }) + + return () => { + cancelled = true + } + }, []) + + useEffect(() => { + let cancelled = false + + historyAPI + .continueWatching(12) + .then((rows) => + rows.map( + (row): HistoryItem => ({ + ...row.history, + created_at: '', + updated_at: '', + media: row.media, + }), + ), + ) + .catch(() => [] as HistoryItem[]) + .then((rows) => { + if (cancelled) return + setHistory(rows.filter((h) => h && !h.completed)) + setHistoryLoading(false) + }) - load() return () => { cancelled = true } @@ -131,15 +140,16 @@ export function HomePage() { const sortedLibraries = useMemo(() => sortByPinnedIds(libraries, pinnedIds), [libraries, pinnedIds]) - const empty = - !loading && - libraries.length === 0 && - history.length === 0 - - if (loading) { + // 库列表还没回来先展示整页 loading；库为空时再等一下播放记录， + // 以免在"空站点"和"有观看记录"两个终态之间闪空白。 + if (librariesLoading || (libraries.length === 0 && historyLoading)) { return } + const empty = + libraries.length === 0 && + history.length === 0 + if (empty) { return } @@ -151,8 +161,9 @@ export function HomePage() { )} - {/* 2. 继续观看（若有历史） */} - {history.length > 0 && } + {/* 2. 继续观看（独立加载，未回来前展示同构骨架） */} + {historyLoading && } + {!historyLoading && history.length > 0 && } {/* 3. 媒体库卡片区 */} {sortedLibraries.length > 0 && ( diff --git a/web/src/pages/HomePageSections.tsx b/web/src/pages/HomePageSections.tsx index b79aabe..e5de800 100644 --- a/web/src/pages/HomePageSections.tsx +++ b/web/src/pages/HomePageSections.tsx @@ -87,6 +87,41 @@ export function HomeEmptyState() { ) } +// ContinueWatchingSkeleton 与 ContinueWatchingSection 同构的占位块： +// 播放记录请求独立渐进加载时，避免区块突然弹入造成的布局跳动。 +export function ContinueWatchingSkeleton() { + return ( +
+
+
+ + + +
+
+
+
+
+
+ +
+ {[0, 1, 2, 3, 4, 5].map((i) => ( +
+
+
+
+
+
+
+
+
+
+ ))} +
+
+ ) +} + /* ========================================================================= 1. 海报轮播区 (Hero Carousel Section) ========================================================================= */ diff --git a/web/src/pages/LibraryMediaSections.tsx b/web/src/pages/LibraryMediaSections.tsx index fd4000b..30ef286 100644 --- a/web/src/pages/LibraryMediaSections.tsx +++ b/web/src/pages/LibraryMediaSections.tsx @@ -2,9 +2,13 @@ import type { ReactNode } from 'react' import { Film } from 'lucide-react' import { MediaCard } from '../components/MediaCard' +import { MEDIA_GRID_CLASS, VirtualMediaGrid } from '../components/VirtualMediaGrid' import type { Media } from '../types' import type { SeriesCard } from '../utils/groupSeries' +// 超过该数量后切换为虚拟滚动：DOM 只挂载视口内的卡片，大库不再线性劣化。 +const VIRTUALIZE_THRESHOLD = 200 + type LibraryMediaSectionsProps = { isSeries: boolean items: Media[] @@ -27,11 +31,10 @@ export function LibraryMediaSections({ return ( <> {!isSeries && items.length > 0 && ( -
- {items.map((media) => ( - - ))} -
+ { + const media = items[index] + return + }} /> )} {!isSeries && items.length === 0 && ( @@ -39,8 +42,9 @@ export function LibraryMediaSections({ )} {isSeries && seriesCards.length > 0 && !selectedSeries && ( -
- {seriesCards.map((series) => ( + { + const series = seriesCards[index] + return ( onSeriesClick(series)} /> - ))} -
+ ) + }} /> )} {isSeries && seriesCards.length === 0 && !loading && ( @@ -59,6 +63,13 @@ export function LibraryMediaSections({ ) } +function MediaGrid({ count, renderItem }: { count: number; renderItem: (index: number) => ReactNode }) { + if (count <= VIRTUALIZE_THRESHOLD) { + return
{Array.from({ length: count }, (_, index) => renderItem(index))}
+ } + return +} + function LibraryEmptyState({ message }: { message: string }) { return (