chore: prefix http/* modules with "http" prefix for easier usage

Author: roman-vanesyan

http/error/error.go http/httperror/error.go

@@ -1,4 +1,4 @@
-package error
+package httperror
 
 import (
 	"fmt"

http/errorhandler/errorhandler.go http/httperror/errorhandler.go

@@ -1,13 +1,13 @@
-package errorhandler
+package httperror
 
 import (
 	"net/http"
-
-	httperror "go.inout.gg/foundations/http/error"
 )
 
-var _ Handler = (HandlerFunc)(nil)
-var _ ErrorHandler = (ErrorHandlerFunc)(nil)
+var (
+	_ Handler      = (HandlerFunc)(nil)
+	_ ErrorHandler = (ErrorHandlerFunc)(nil)
+)
 
 // Handler is like http.Handler, but with an additional error return value.
 type Handler interface {
@@ -47,7 +47,7 @@ func WithErrorHandler(errorHandler ErrorHandler) func(HandlerFunc) http.HandlerF
 
 // DefaultErrorHandler is the default error handler.
 var DefaultErrorHandler = ErrorHandlerFunc(func(w http.ResponseWriter, r *http.Request, err error) {
-	if err, ok := err.(httperror.HttpError); ok {
+	if err, ok := err.(HttpError); ok {
 		http.Error(w, err.Error(), err.StatusCode())
 		return
 	}

http/handler/todo.go http/httphandler/todo.go

@@ -1,4 +1,4 @@
-package handler
+package httphandler
 
 import "net/http"
 

http/ip/ip.go http/httpip/ip.go

@@ -1,4 +1,4 @@
-package ip
+package httpip
 
 import (
 	"net"

http/middleware/chain.go http/httpmiddleware/chain.go

@@ -1,9 +1,10 @@
-package middleware
+package httpmiddleware
 
 import "net/http"
 
 var _ Middleware = (*Chain)(nil)
 
+// Chain represents a sequence of middlewares acting as a single Middleware.
 type Chain struct {
 	middlewares []Middleware
 }

http/middleware/chain_test.go http/httpmiddleware/chain_test.go

@@ -1,4 +1,4 @@
-package middleware
+package httpmiddleware
 
 import (
 	"net/http"

http/middleware/middleware.go http/httpmiddleware/middleware.go

@@ -1,4 +1,4 @@
-package middleware
+package httpmiddleware
 
 import "net/http"
 

http/request/request.go http/httprequest/request.go

@@ -1,4 +1,4 @@
-package request
+package httprequest
 
 import (
 	"encoding/json"
@@ -26,16 +26,16 @@ var (
 func DecodeJSON[T any](r *http.Request) (*T, error) {
 	ctx := r.Context()
 
-	var v T
-	if err := json.NewDecoder(r.Body).Decode(&v); err != nil {
+	var v *T
+	if err := json.NewDecoder(r.Body).Decode(v); err != nil {
 		return nil, fmt.Errorf("http/request: unable to decode JSON: %w", err)
 	}
 
-	if err := Validator.StructCtx(ctx, &v); err != nil {
+	if err := Validator.StructCtx(ctx, v); err != nil {
 		return nil, err
 	}
 
-	return &v, nil
+	return v, nil
 }
 
 // DecodeForm converts a url.Values (including form values) from the incoming

http/request/request_test.go http/httprequest/request_test.go

@@ -1,4 +1,4 @@
-package request
+package httprequest
 
 import (
 	"bytes"

http/response/json.go http/httpresponse/json.go

@@ -1,6 +1,6 @@
 //go:build !production
 
-package response
+package httpresponse
 
 import (
 	"encoding/json"

http/response/json_devel.go http/httpresponse/json_devel.go

@@ -1,4 +1,4 @@
-package response
+package httpresponse
 
 import (
 	"fmt"

http/response/templ.go http/httpresponse/templ.go

@@ -1,15 +1,15 @@
-package server
+package httpserver
 
 import (
 	"context"
 	"crypto/tls"
 	"errors"
+	"log/slog"
 	"net"
 	"net/http"
 	"time"
 
-	"log/slog"
-
+	"go.inout.gg/foundations/debug"
 	"go.inout.gg/foundations/startstop"
 	"golang.org/x/crypto/acme/autocert"
 	"golang.org/x/sync/errgroup"
@@ -27,15 +27,18 @@ type Server struct {
 type ServerConfig struct {
 	Handler http.Handler
 
-	// If EnableACME flag is set Port option is ignored.
+	// If EnableACME flag is this option is ignored.
 	Port int
 
 	// If EnableACME is true, then the server will use Let's Encrypt to automatically.
 	EnableACME bool
 	ACMEHosts  []string
 }
 
+// NewServer creates a new HTTP server using the provded config.
 func NewServer(config *ServerConfig) *Server {
+	debug.Assert(config.Handler != nil, "expected Handler to be configured")
+
 	return &Server{
 		log:    slog.Default().With("name", "Server"),
 		config: config,

http/server/server.go http/httpserver/server.go

@@ -1,22 +0,0 @@
-package db
-
-import (
-	"net/http"
-
-	"github.com/jackc/pgx/v5/pgxpool"
-	"go.inout.gg/foundations/http/middleware"
-)
-
-// FromRequest returns the pool associated with the given http request.
-func FromRequest(req *http.Request) (*pgxpool.Pool, error) {
-	return FromContext(req.Context())
-}
-
-// Middleware returns a middleware that injects the given pool into the request context.
-func Middleware(db *pgxpool.Pool) middleware.MiddlewareFunc {
-	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-			next.ServeHTTP(w, req.WithContext(WithContext(req.Context(), db)))
-		})
-	}
-}

sql/db/middleware.go

@@ -1,43 +0,0 @@
-package html
-
-import (
-	"context"
-	"errors"
-	"net/http"
-
-	"go.inout.gg/foundations/http/middleware"
-	"go.inout.gg/foundations/must"
-)
-
-type ctxKey struct{}
-
-var kCtxKey = ctxKey{}
-
-func Middleware(r Renderer) middleware.MiddlewareFunc {
-	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-			next.ServeHTTP(w, req.WithContext(context.WithValue(req.Context(), kCtxKey, r)))
-		})
-	}
-}
-
-// Render renders an HTML template with the given name and variables.
-func Render(w http.ResponseWriter, req *http.Request, name string, vars ...any) error {
-	render, ok := req.Context().Value(kCtxKey).(Renderer)
-	if !ok {
-		return errors.New(
-			"http/render: unable to retrieve render from request context. Make sure to use corresponding middleware.",
-		)
-	}
-
-	if err := render.Render(w, name, vars); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// MustRender is like Render, but panics if an error occurs.
-func MustRender(w http.ResponseWriter, req *http.Request, name string, vars ...any) {
-	must.Must1(Render(w, req, name, vars...))
-}