From 37438744c6da49c355da528c054ae0c9210ade29 Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Sun, 24 Dec 2023 21:46:38 +0300 Subject: [PATCH] update missinggo --- server/go.mod | 4 +- server/torr/stream.go | 2 +- server/web/api/m3u.go | 2 +- server/web/pages/template/route.go | 160 +++++++++++++++++++++++++++-- 4 files changed, 154 insertions(+), 14 deletions(-) diff --git a/server/go.mod b/server/go.mod index c314b43..a8b2299 100644 --- a/server/go.mod +++ b/server/go.mod @@ -9,7 +9,7 @@ require ( github.com/alexflint/go-arg v1.4.3 github.com/anacrolix/dms v1.6.0 github.com/anacrolix/log v0.14.5 - github.com/anacrolix/missinggo v1.3.0 + github.com/anacrolix/missinggo/v2 v2.7.3 github.com/anacrolix/publicip v0.3.0 github.com/anacrolix/torrent v1.53.2 github.com/gin-contrib/cors v1.5.0 @@ -36,8 +36,8 @@ require ( github.com/anacrolix/dht/v2 v2.21.0 // indirect github.com/anacrolix/ffprobe v1.1.0 // indirect github.com/anacrolix/generics v0.0.0-20230911070922-5dd7545c6b13 // indirect + github.com/anacrolix/missinggo v1.3.0 // indirect github.com/anacrolix/missinggo/perf v1.0.0 // indirect - github.com/anacrolix/missinggo/v2 v2.7.3 // indirect github.com/anacrolix/multiless v0.3.1-0.20221221005021-2d12701f83f7 // indirect github.com/anacrolix/stm v0.5.0 // indirect github.com/anacrolix/sync v0.5.1 // indirect diff --git a/server/torr/stream.go b/server/torr/stream.go index 665b98f..6ad9ffc 100644 --- a/server/torr/stream.go +++ b/server/torr/stream.go @@ -10,7 +10,7 @@ import ( "time" "github.com/anacrolix/dms/dlna" - "github.com/anacrolix/missinggo/httptoo" + "github.com/anacrolix/missinggo/v2/httptoo" "github.com/anacrolix/torrent" mt "server/mimetype" diff --git a/server/web/api/m3u.go b/server/web/api/m3u.go index b01ad27..726ad83 100644 --- a/server/web/api/m3u.go +++ b/server/web/api/m3u.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/anacrolix/missinggo/httptoo" + "github.com/anacrolix/missinggo/v2/httptoo" sets "server/settings" "server/torr" diff --git a/server/web/pages/template/route.go b/server/web/pages/template/route.go index f5916d1..93e9503 100644 --- a/server/web/pages/template/route.go +++ b/server/web/pages/template/route.go @@ -1,191 +1,331 @@ package template import ( + "crypto/md5" + "fmt" "github.com/gin-gonic/gin" ) func RouteWebPages(route *gin.RouterGroup) { route.GET("/", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Indexhtml)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "text/html; charset=utf-8", Indexhtml) }) route.GET("/apple-splash-1125-2436.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash11252436jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash11252436jpg) }) route.GET("/apple-splash-1136-640.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash1136640jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash1136640jpg) }) route.GET("/apple-splash-1170-2532.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash11702532jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash11702532jpg) }) route.GET("/apple-splash-1242-2208.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash12422208jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash12422208jpg) }) route.GET("/apple-splash-1242-2688.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash12422688jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash12422688jpg) }) route.GET("/apple-splash-1284-2778.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash12842778jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash12842778jpg) }) route.GET("/apple-splash-1334-750.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash1334750jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash1334750jpg) }) route.GET("/apple-splash-1536-2048.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash15362048jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash15362048jpg) }) route.GET("/apple-splash-1620-2160.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash16202160jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash16202160jpg) }) route.GET("/apple-splash-1668-2224.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash16682224jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash16682224jpg) }) route.GET("/apple-splash-1668-2388.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash16682388jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash16682388jpg) }) route.GET("/apple-splash-1792-828.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash1792828jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash1792828jpg) }) route.GET("/apple-splash-2048-1536.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash20481536jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash20481536jpg) }) route.GET("/apple-splash-2048-2732.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash20482732jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash20482732jpg) }) route.GET("/apple-splash-2160-1620.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash21601620jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash21601620jpg) }) route.GET("/apple-splash-2208-1242.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash22081242jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash22081242jpg) }) route.GET("/apple-splash-2224-1668.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash22241668jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash22241668jpg) }) route.GET("/apple-splash-2388-1668.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash23881668jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash23881668jpg) }) route.GET("/apple-splash-2436-1125.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash24361125jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash24361125jpg) }) route.GET("/apple-splash-2532-1170.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash25321170jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash25321170jpg) }) route.GET("/apple-splash-2688-1242.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash26881242jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash26881242jpg) }) route.GET("/apple-splash-2732-2048.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash27322048jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash27322048jpg) }) route.GET("/apple-splash-2778-1284.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash27781284jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash27781284jpg) }) route.GET("/apple-splash-640-1136.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash6401136jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash6401136jpg) }) route.GET("/apple-splash-750-1334.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash7501334jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash7501334jpg) }) route.GET("/apple-splash-828-1792.jpg", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Applesplash8281792jpg)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/jpeg", Applesplash8281792jpg) }) route.GET("/asset-manifest.json", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Assetmanifestjson)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "application/json", Assetmanifestjson) }) route.GET("/browserconfig.xml", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Browserconfigxml)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "application/xml; charset=utf-8", Browserconfigxml) }) route.GET("/dlnaicon-120.png", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Dlnaicon120png)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/png", Dlnaicon120png) }) route.GET("/dlnaicon-48.png", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Dlnaicon48png)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/png", Dlnaicon48png) }) route.GET("/favicon-16x16.png", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Favicon16x16png)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/png", Favicon16x16png) }) route.GET("/favicon-32x32.png", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Favicon32x32png)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/png", Favicon32x32png) }) route.GET("/favicon.ico", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Faviconico)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/vnd.microsoft.icon", Faviconico) }) route.GET("/icon.png", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Iconpng)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/png", Iconpng) }) route.GET("/index.html", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Indexhtml)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "text/html; charset=utf-8", Indexhtml) }) route.GET("/logo.png", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Logopng)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/png", Logopng) }) route.GET("/mstile-150x150.png", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Mstile150x150png)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "image/png", Mstile150x150png) }) route.GET("/site.webmanifest", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Sitewebmanifest)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "application/manifest+json", Sitewebmanifest) }) - route.GET("/static/js/2.ddcd1461.chunk.js", func(c *gin.Context) { - c.Data(200, "application/javascript; charset=utf-8", Staticjs2ddcd1461chunkjs) + route.GET("/static/js/2.56a11991.chunk.js", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Staticjs256a11991chunkjs)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) + c.Data(200, "application/javascript; charset=utf-8", Staticjs256a11991chunkjs) }) - route.GET("/static/js/2.ddcd1461.chunk.js.LICENSE.txt", func(c *gin.Context) { - c.Data(200, "text/plain; charset=utf-8", Staticjs2ddcd1461chunkjsLICENSEtxt) + route.GET("/static/js/2.56a11991.chunk.js.LICENSE.txt", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Staticjs256a11991chunkjsLICENSEtxt)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) + c.Data(200, "text/plain; charset=utf-8", Staticjs256a11991chunkjsLICENSEtxt) }) - route.GET("/static/js/2.ddcd1461.chunk.js.map", func(c *gin.Context) { - c.Data(200, "application/json", Staticjs2ddcd1461chunkjsmap) + route.GET("/static/js/2.56a11991.chunk.js.map", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Staticjs256a11991chunkjsmap)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) + c.Data(200, "application/json", Staticjs256a11991chunkjsmap) }) - route.GET("/static/js/main.4dafb19b.chunk.js", func(c *gin.Context) { - c.Data(200, "application/javascript; charset=utf-8", Staticjsmain4dafb19bchunkjs) + route.GET("/static/js/main.572b1543.chunk.js", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Staticjsmain572b1543chunkjs)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) + c.Data(200, "application/javascript; charset=utf-8", Staticjsmain572b1543chunkjs) }) - route.GET("/static/js/main.4dafb19b.chunk.js.map", func(c *gin.Context) { - c.Data(200, "application/json", Staticjsmain4dafb19bchunkjsmap) + route.GET("/static/js/main.572b1543.chunk.js.map", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Staticjsmain572b1543chunkjsmap)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) + c.Data(200, "application/json", Staticjsmain572b1543chunkjsmap) }) route.GET("/static/js/runtime-main.f542387e.js", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Staticjsruntimemainf542387ejs)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "application/javascript; charset=utf-8", Staticjsruntimemainf542387ejs) }) route.GET("/static/js/runtime-main.f542387e.js.map", func(c *gin.Context) { + etag := fmt.Sprintf("%x", md5.Sum(Staticjsruntimemainf542387ejsmap)) + c.Header("Cache-Control", "public, max-age=31536000") + c.Header("ETag", etag) c.Data(200, "application/json", Staticjsruntimemainf542387ejsmap) }) }