Some checks failed
check / check (push) Failing after 23s
Mode parser (internal/service/service.go): - Reject strings without leading + or - (e.g. "xw", "w", "") with ERR_UMODEUNKNOWNFLAG instead of silently treating them as "-". - Support multi-sign transitions: +w-o, -w+o, +o-w+w, -x+y, +y-x. The active sign flips each time + or - is seen; subsequent letters apply with the active sign. - Atomic from caller's perspective: parse the whole string to a list of ops first, reject the whole request on any unknown mode char, and only then apply ops to the DB. Partial application of +w before rejecting +o is gone. - HTTP and IRC still share the same ApplyUserMode entry point. Router race (internal/server/server.go): - The fx OnStart hook previously spawned serve() in a goroutine that called SetupRoutes asynchronously, while ServeHTTP delegated to srv.router. Test harnesses (httptest wrapping srv as Handler) raced against SetupRoutes writing srv.router vs ServeHTTP reading it, producing the race detector failures in CI on main. - SetupRoutes is now called synchronously inside OnStart before the serve goroutine starts, so srv.router is fully initialized before any request can reach ServeHTTP. Tests (internal/service/service_test.go): - Replaced the per-mode tests with a single table-driven TestApplyUserMode that asserts both the returned mode string and the persisted DB state (oper/wallops) for each case, including the malformed and multi-sign cases above. The +wz case seeds wallops=true to prove the whole string is rejected and +w is not partially applied.
234 lines
5.1 KiB
Go
234 lines
5.1 KiB
Go
// Package server implements the main HTTP server for the neoirc application.
|
|
package server
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"log/slog"
|
|
"net/http"
|
|
"os"
|
|
"os/signal"
|
|
"syscall"
|
|
"time"
|
|
|
|
"go.uber.org/fx"
|
|
"sneak.berlin/go/neoirc/internal/config"
|
|
"sneak.berlin/go/neoirc/internal/globals"
|
|
"sneak.berlin/go/neoirc/internal/handlers"
|
|
"sneak.berlin/go/neoirc/internal/logger"
|
|
"sneak.berlin/go/neoirc/internal/middleware"
|
|
|
|
"github.com/getsentry/sentry-go"
|
|
"github.com/go-chi/chi/v5"
|
|
|
|
_ "github.com/joho/godotenv/autoload" // loads .env file
|
|
)
|
|
|
|
const (
|
|
shutdownTimeout = 5 * time.Second
|
|
sentryFlushTime = 2 * time.Second
|
|
)
|
|
|
|
// Params defines the dependencies for creating a Server.
|
|
type Params struct {
|
|
fx.In
|
|
|
|
Logger *logger.Logger
|
|
Globals *globals.Globals
|
|
Config *config.Config
|
|
Middleware *middleware.Middleware
|
|
Handlers *handlers.Handlers
|
|
}
|
|
|
|
// Server is the main HTTP server.
|
|
// It manages routing, middleware, and lifecycle.
|
|
type Server struct {
|
|
startupTime time.Time
|
|
exitCode int
|
|
sentryEnabled bool
|
|
log *slog.Logger
|
|
ctx context.Context //nolint:containedctx // signal handling pattern
|
|
cancelFunc context.CancelFunc
|
|
httpServer *http.Server
|
|
router *chi.Mux
|
|
params Params
|
|
mw *middleware.Middleware
|
|
handlers *handlers.Handlers
|
|
}
|
|
|
|
// New creates a new Server and registers its lifecycle hooks.
|
|
func New(
|
|
lifecycle fx.Lifecycle, params Params,
|
|
) (*Server, error) {
|
|
srv := &Server{ //nolint:exhaustruct // fields set during lifecycle
|
|
params: params,
|
|
mw: params.Middleware,
|
|
handlers: params.Handlers,
|
|
log: params.Logger.Get(),
|
|
}
|
|
|
|
lifecycle.Append(fx.Hook{
|
|
OnStart: func(_ context.Context) error {
|
|
srv.startupTime = time.Now()
|
|
// Configure, enable Sentry, and build the router
|
|
// synchronously so that srv.router is fully initialized
|
|
// before OnStart returns. Any HTTP traffic (including
|
|
// httptest harnesses that wrap srv as a handler) is
|
|
// therefore guaranteed to see an initialized router,
|
|
// eliminating the previous race between SetupRoutes
|
|
// and ServeHTTP.
|
|
srv.configure()
|
|
srv.enableSentry()
|
|
srv.SetupRoutes()
|
|
go srv.serve() //nolint:contextcheck
|
|
|
|
return nil
|
|
},
|
|
OnStop: func(_ context.Context) error {
|
|
return nil
|
|
},
|
|
})
|
|
|
|
return srv, nil
|
|
}
|
|
|
|
// Run configures the server and begins serving. It blocks
|
|
// until shutdown is signalled. Kept for external callers
|
|
// that embed the server outside fx. The fx lifecycle now
|
|
// performs setup synchronously in OnStart and invokes
|
|
// serve directly in a goroutine, so this is only used when
|
|
// the server is driven by hand.
|
|
func (srv *Server) Run() {
|
|
srv.configure()
|
|
srv.enableSentry()
|
|
srv.SetupRoutes()
|
|
srv.serve()
|
|
}
|
|
|
|
// ServeHTTP delegates to the chi router.
|
|
func (srv *Server) ServeHTTP(
|
|
writer http.ResponseWriter,
|
|
request *http.Request,
|
|
) {
|
|
srv.router.ServeHTTP(writer, request)
|
|
}
|
|
|
|
// MaintenanceMode reports whether the server is in maintenance mode.
|
|
func (srv *Server) MaintenanceMode() bool {
|
|
return srv.params.Config.MaintenanceMode
|
|
}
|
|
|
|
func (srv *Server) enableSentry() {
|
|
srv.sentryEnabled = false
|
|
|
|
if srv.params.Config.SentryDSN == "" {
|
|
return
|
|
}
|
|
|
|
err := sentry.Init(sentry.ClientOptions{ //nolint:exhaustruct // only essential fields
|
|
Dsn: srv.params.Config.SentryDSN,
|
|
Release: fmt.Sprintf(
|
|
"%s-%s",
|
|
srv.params.Globals.Appname,
|
|
srv.params.Globals.Version,
|
|
),
|
|
})
|
|
if err != nil {
|
|
srv.log.Error("sentry init failure", "error", err)
|
|
os.Exit(1)
|
|
}
|
|
|
|
srv.log.Info("sentry error reporting activated")
|
|
srv.sentryEnabled = true
|
|
}
|
|
|
|
func (srv *Server) serve() int {
|
|
srv.ctx, srv.cancelFunc = context.WithCancel(
|
|
context.Background(),
|
|
)
|
|
|
|
go func() {
|
|
sigCh := make(chan os.Signal, 1)
|
|
|
|
signal.Ignore(syscall.SIGPIPE)
|
|
signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
|
|
|
|
sig := <-sigCh
|
|
|
|
srv.log.Info("signal received", "signal", sig)
|
|
|
|
if srv.cancelFunc != nil {
|
|
srv.cancelFunc()
|
|
}
|
|
}()
|
|
|
|
go srv.serveUntilShutdown()
|
|
|
|
<-srv.ctx.Done()
|
|
|
|
srv.cleanShutdown()
|
|
|
|
return srv.exitCode
|
|
}
|
|
|
|
func (srv *Server) cleanupForExit() {
|
|
srv.log.Info("cleaning up")
|
|
}
|
|
|
|
func (srv *Server) cleanShutdown() {
|
|
srv.exitCode = 0
|
|
|
|
ctxShutdown, shutdownCancel := context.WithTimeout(
|
|
context.Background(), shutdownTimeout,
|
|
)
|
|
|
|
err := srv.httpServer.Shutdown(ctxShutdown)
|
|
if err != nil {
|
|
srv.log.Error(
|
|
"server clean shutdown failed", "error", err,
|
|
)
|
|
}
|
|
|
|
if shutdownCancel != nil {
|
|
shutdownCancel()
|
|
}
|
|
|
|
srv.cleanupForExit()
|
|
|
|
if srv.sentryEnabled {
|
|
sentry.Flush(sentryFlushTime)
|
|
}
|
|
}
|
|
|
|
func (srv *Server) configure() {
|
|
// Server configuration placeholder.
|
|
}
|
|
|
|
func (srv *Server) serveUntilShutdown() {
|
|
listenAddr := fmt.Sprintf(
|
|
":%d", srv.params.Config.Port,
|
|
)
|
|
|
|
srv.httpServer = &http.Server{ //nolint:exhaustruct // optional fields
|
|
Addr: listenAddr,
|
|
ReadTimeout: httpReadTimeout,
|
|
WriteTimeout: httpWriteTimeout,
|
|
MaxHeaderBytes: maxHeaderBytes,
|
|
Handler: srv,
|
|
}
|
|
|
|
srv.log.Info(
|
|
"http begin listen", "listenaddr", listenAddr,
|
|
)
|
|
|
|
err := srv.httpServer.ListenAndServe()
|
|
if err != nil && !errors.Is(err, http.ErrServerClosed) {
|
|
srv.log.Error("listen error", "error", err)
|
|
|
|
if srv.cancelFunc != nil {
|
|
srv.cancelFunc()
|
|
}
|
|
}
|
|
}
|