refactor: dependency injection instead of package globals (#57)

* refactor: export Settings type, Setup returns value

* refactor: resolver.Setup takes explicit Settings struct

* refactor: GetHeadersWithoutTrustedHeaders takes explicit header params

* refactor: server constructors take narrow config

* refactor: Router struct with handler methods, remove geoSvc global

* refactor: wire DI through main, remove setting.App references

* refactor: remove App global, use returned Settings

* refactor: update router tests for DI

* chore: fix lint issues — rename ServerTimeouts to Timeouts, fix shadowed variables
This commit is contained in:
2026-07-21 18:37:21 +02:00
committed by GitHub
parent 3874f6af3f
commit 2e32a20f60
19 changed files with 298 additions and 253 deletions
+10 -5
View File
@@ -6,7 +6,6 @@ import (
"log"
"net/http"
"github.com/dcarrillo/whatismyip/internal/setting"
"github.com/quic-go/quic-go/http3"
)
@@ -14,18 +13,24 @@ type Quic struct {
server *http3.Server
tlsServer *TLS
ctx context.Context
addr string
crtPath string
keyPath string
}
func NewQuicServer(ctx context.Context, tlsServer *TLS) *Quic {
func NewQuicServer(ctx context.Context, tlsServer *TLS, addr, crt, key string) *Quic {
return &Quic{
tlsServer: tlsServer,
ctx: ctx,
addr: addr,
crtPath: crt,
keyPath: key,
}
}
func (q *Quic) Start() {
q.server = &http3.Server{
Addr: setting.App.TLSAddress,
Addr: q.addr,
Handler: q.tlsServer.server.Handler,
}
@@ -38,9 +43,9 @@ func (q *Quic) Start() {
parentHandler.ServeHTTP(rw, req)
})
log.Printf("Starting QUIC server listening on %s (udp)", setting.App.TLSAddress)
log.Printf("Starting QUIC server listening on %s (udp)", q.addr)
go func() {
if err := q.server.ListenAndServeTLS(setting.App.TLSCrtPath, setting.App.TLSKeyPath); err != nil &&
if err := q.server.ListenAndServeTLS(q.crtPath, q.keyPath); err != nil &&
!errors.Is(err, http.ErrServerClosed) {
log.Fatal(err)
}