feat: Non-existing pages now return styled 404 status page (with `4…

…04` status code) (#189) * 🎨 style(CHANGELOG.md): add UNRELEASED section 🔧 chore(notfound/handler.go): refactor to use core.RespondWithErrorPage 🔧 chore(http/server.go): pass config, templatePicker, renderer and options to notfoundHandler 🔧 chore(hurl/404.hurl): update test to expect HTML response instead of plain text * 📝 docs(CHANGELOG.md): fix typo in changed section * 🔥 chore(CHANGELOG.md): release version 2.22.0 🔥 chore(flags.go): remove unused code for serve command
tarampampam · Apr 7, 2023 · d40e887 · d40e887
1 parent 6a67510
commit d40e887
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 227 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this package will be documented in this file.
 
 The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver].
 
+## v2.22.0
+
+### Changed
+
+- Non-existing pages now return styled `404` status page (with `404` status code) [#188]
+
+[#188]:https://github.com/tarampampam/error-pages/issues/188
+
 ## v2.21.0
 
 ### Changed

diff --git a/internal/cli/serve/flags.go b/internal/cli/serve/flags.go
diff --git a/internal/http/handlers/notfound/handler.go b/internal/http/handlers/notfound/handler.go
@@ -2,13 +2,27 @@ package notfound
 
 import (
 	"github.com/valyala/fasthttp"
+
+	"gh.tarampamp.am/error-pages/internal/config"
+	"gh.tarampamp.am/error-pages/internal/http/core"
+	"gh.tarampamp.am/error-pages/internal/options"
+	"gh.tarampamp.am/error-pages/internal/tpl"
+)
+
+type (
+	templatePicker interface {
+		// Pick the template name for responding.
+		Pick() string
+	}
+
+	renderer interface {
+		Render(content []byte, props tpl.Properties) ([]byte, error)
+	}
 )
 
 // NewHandler creates handler missing requests handling.
-func NewHandler() fasthttp.RequestHandler {
+func NewHandler(cfg *config.Config, p templatePicker, rdr renderer, opt options.ErrorPage) fasthttp.RequestHandler {
 	return func(ctx *fasthttp.RequestCtx) {
-		ctx.SetContentType("text/plain; charset=utf-8")
-		ctx.SetStatusCode(fasthttp.StatusNotFound)
-		_, _ = ctx.WriteString("Wrong request URL. Error pages are available at the following URLs: /{code}.html")
+		core.RespondWithErrorPage(ctx, cfg, p, rdr, "404", fasthttp.StatusNotFound, opt)
 	}
 }
diff --git a/internal/http/server.go b/internal/http/server.go
@@ -88,7 +88,7 @@ func (s *Server) Register(cfg *config.Config, templatePicker templatePicker, opt
 
 	s.router.GET("/metrics", metricsHandler.NewHandler(reg))
 
-	s.router.NotFound = notfoundHandler.NewHandler()
+	s.router.NotFound = notfoundHandler.NewHandler(cfg, templatePicker, s.rdr, opt)
 
 	return nil
 }

diff --git a/test/hurl/404.hurl b/test/hurl/404.hurl
@@ -3,5 +3,5 @@ GET http://{{ host }}:{{ port }}/not-found
 HTTP/* 404
 
 [Asserts]
-header "Content-Type" contains "text/plain"
-body contains "Wrong request URL"
+header "Content-Type" contains "text/html"
+body contains "The server can not find the requested page"