remove and deprecate lru (server side caching) - library had bugs

gilmaimon · Jul 27, 2024 · 4ad7744 · 4ad7744
1 parent 5a5ddb8
commit 4ad7744
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 224 deletions.
diff --git a/config-prod.yaml b/config-prod.yaml
@@ -10,9 +10,6 @@ cache:
   enabled: true
   time_in_hours: 4
 
-lru:
-  enabled: true
-
 tls:
   port: 443
   enabled: false

diff --git a/server-v2/config/serverconfig.go b/server-v2/config/serverconfig.go
@@ -27,9 +27,6 @@ type ServerConfiguration struct {
 	Libraries struct {
 		RefreshRateHours int64 `yaml:"refresh_rate_hours"`
 	} `yaml:"libraries"`
-	LRU struct {
-		Enabled bool `yaml:"enabled"`
-	} `yaml:"lru"`
 }
 
 func ReadServerConfiguration(path string) ServerConfiguration {

diff --git a/server-v2/go.mod b/server-v2/go.mod
@@ -4,7 +4,6 @@ go 1.21
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1
-	github.com/SporkHubr/echo-http-cache v0.0.0-20200706100054-1d7ae9f38029
 	github.com/essentialkaos/go-badge v1.4.1
 	github.com/labstack/echo/v4 v4.12.0
 	gopkg.in/yaml.v3 v3.0.1
@@ -24,4 +23,5 @@ require (
 	golang.org/x/sys v0.19.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 )
diff --git a/server-v2/go.sum b/server-v2/go.sum
diff --git a/server-v2/main.go b/server-v2/main.go
@@ -42,26 +42,23 @@ func main() {
 		middlewares.EnableLogging(server)
 	}
 
-	if configuration.LRU.Enabled {
-		middlewares.EnableServerCaching(server)
-	}
-
-	server.Static("/", configuration.Server.StaticDir)
+	// Static files
 	server.Static("/static", configuration.Server.StaticDir+"/static")
 	server.File("/favicon.png", configuration.Server.StaticDir+"/favicon.png")
 	server.GET("/manifest.json", func(c echo.Context) error {
 		return c.File(configuration.Server.StaticDir + "/manifest.json")
 	})
 
-	// handlers and routes
+	// API routes
 	server.GET("/stats/recent", (&handlers.RecentHandler{LibrariesDal: dal}).Handle)
 	server.GET("/library/:library", (&handlers.LibraryHandler{LibrariesDal: dal}).Handle)
 	server.GET("/badge/:library", (&handlers.BadgeHandler{
 		LibrariesDal:   dal,
 		BadgeGenerator: badgeGenerator,
 	}).Handle)
 
-	server.GET("/*", func(c echo.Context) error {
+	// Catch-all route for single-page application (SPA)
+	server.GET("*", func(c echo.Context) error {
 		return c.File(configuration.Server.StaticDir + "/index.html")
 	})
 

diff --git a/server-v2/middlewares/lru.go b/server-v2/middlewares/lru.go
diff --git a/server-v2/server.yaml b/server-v2/server.yaml
@@ -10,12 +10,9 @@ cache:
   enabled: true
   time_in_hours: 4
 
-lru:
-  enabled: true
-
 tls:
   port: 443
-  enabled: true
+  enabled: false
   crt_file: ../cert.pem
   key_file: ../privkey.pem