From 8219037739c844603e4c7b59fda03ed0d4bdd47a Mon Sep 17 00:00:00 2001
From: Runxi Yu <me@runxiyu.org>
Date: Sun, 17 Aug 2025 15:08:44 +0800
Subject: Split the handler up

---
 forged/internal/incoming/web/handler.go |  8 ++++
 forged/internal/incoming/web/server.go  | 79 +++++++++++++++++++++++++++++++
 forged/internal/incoming/web/web.go     | 84 ---------------------------------
 3 files changed, 87 insertions(+), 84 deletions(-)
 create mode 100644 forged/internal/incoming/web/handler.go
 create mode 100644 forged/internal/incoming/web/server.go
 delete mode 100644 forged/internal/incoming/web/web.go

(limited to 'forged')

diff --git a/forged/internal/incoming/web/handler.go b/forged/internal/incoming/web/handler.go
new file mode 100644
index 0000000..e638bf7
--- /dev/null
+++ b/forged/internal/incoming/web/handler.go
@@ -0,0 +1,8 @@
+package web
+
+import "net/http"
+
+type handler struct{}
+
+func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+}
diff --git a/forged/internal/incoming/web/server.go b/forged/internal/incoming/web/server.go
new file mode 100644
index 0000000..e1afcc2
--- /dev/null
+++ b/forged/internal/incoming/web/server.go
@@ -0,0 +1,79 @@
+package web
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"net"
+	"net/http"
+	"time"
+
+	"go.lindenii.runxiyu.org/forge/forged/internal/common/misc"
+)
+
+type Server struct {
+	net             string
+	addr            string
+	root            string
+	httpServer      *http.Server
+	shutdownTimeout uint32
+}
+
+type Config struct {
+	Net             string `scfg:"net"`
+	Addr            string `scfg:"addr"`
+	Root            string `scfg:"root"`
+	CookieExpiry    int    `scfg:"cookie_expiry"`
+	ReadTimeout     uint32 `scfg:"read_timeout"`
+	WriteTimeout    uint32 `scfg:"write_timeout"`
+	IdleTimeout     uint32 `scfg:"idle_timeout"`
+	MaxHeaderBytes  int    `scfg:"max_header_bytes"`
+	ReverseProxy    bool   `scfg:"reverse_proxy"`
+	ShutdownTimeout uint32 `scfg:"shutdown_timeout"`
+}
+
+func New(config Config) (server *Server) {
+	httpServer := &http.Server{
+		Handler:        &handler{},
+		ReadTimeout:    time.Duration(config.ReadTimeout) * time.Second,
+		WriteTimeout:   time.Duration(config.WriteTimeout) * time.Second,
+		IdleTimeout:    time.Duration(config.IdleTimeout) * time.Second,
+		MaxHeaderBytes: config.MaxHeaderBytes,
+	} //exhaustruct:ignore
+	return &Server{
+		net:             config.Net,
+		addr:            config.Addr,
+		root:            config.Root,
+		shutdownTimeout: config.ShutdownTimeout,
+		httpServer:      httpServer,
+	}
+}
+
+func (server *Server) Run(ctx context.Context) (err error) {
+	server.httpServer.BaseContext = func(_ net.Listener) context.Context { return ctx }
+
+	listener, err := misc.Listen(ctx, server.net, server.addr)
+	if err != nil {
+		return fmt.Errorf("listen for web: %w", err)
+	}
+	defer func() {
+		_ = listener.Close()
+	}()
+
+	stop := context.AfterFunc(ctx, func() {
+		shCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), time.Duration(server.shutdownTimeout)*time.Second)
+		defer cancel()
+		_ = server.httpServer.Shutdown(shCtx)
+		_ = listener.Close()
+	})
+	defer stop()
+
+	err = server.httpServer.Serve(listener)
+	if err != nil {
+		if errors.Is(err, http.ErrServerClosed) || ctx.Err() != nil {
+			return nil
+		}
+		return fmt.Errorf("serve web: %w", err)
+	}
+	panic("unreachable")
+}
diff --git a/forged/internal/incoming/web/web.go b/forged/internal/incoming/web/web.go
deleted file mode 100644
index 5c95013..0000000
--- a/forged/internal/incoming/web/web.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package web
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net"
-	"net/http"
-	"time"
-
-	"go.lindenii.runxiyu.org/forge/forged/internal/common/misc"
-)
-
-type Server struct {
-	net             string
-	addr            string
-	root            string
-	httpServer      *http.Server
-	shutdownTimeout uint32
-}
-
-type handler struct{}
-
-func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-}
-
-type Config struct {
-	Net             string `scfg:"net"`
-	Addr            string `scfg:"addr"`
-	Root            string `scfg:"root"`
-	CookieExpiry    int    `scfg:"cookie_expiry"`
-	ReadTimeout     uint32 `scfg:"read_timeout"`
-	WriteTimeout    uint32 `scfg:"write_timeout"`
-	IdleTimeout     uint32 `scfg:"idle_timeout"`
-	MaxHeaderBytes  int    `scfg:"max_header_bytes"`
-	ReverseProxy    bool   `scfg:"reverse_proxy"`
-	ShutdownTimeout uint32 `scfg:"shutdown_timeout"`
-}
-
-func New(config Config) (server *Server) {
-	httpServer := &http.Server{
-		Handler:        &handler{},
-		ReadTimeout:    time.Duration(config.ReadTimeout) * time.Second,
-		WriteTimeout:   time.Duration(config.WriteTimeout) * time.Second,
-		IdleTimeout:    time.Duration(config.IdleTimeout) * time.Second,
-		MaxHeaderBytes: config.MaxHeaderBytes,
-	} //exhaustruct:ignore
-	return &Server{
-		net:             config.Net,
-		addr:            config.Addr,
-		root:            config.Root,
-		shutdownTimeout: config.ShutdownTimeout,
-		httpServer:      httpServer,
-	}
-}
-
-func (server *Server) Run(ctx context.Context) (err error) {
-	server.httpServer.BaseContext = func(_ net.Listener) context.Context { return ctx }
-
-	listener, err := misc.Listen(ctx, server.net, server.addr)
-	if err != nil {
-		return fmt.Errorf("listen for web: %w", err)
-	}
-	defer func() {
-		_ = listener.Close()
-	}()
-
-	stop := context.AfterFunc(ctx, func() {
-		shCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), time.Duration(server.shutdownTimeout)*time.Second)
-		defer cancel()
-		_ = server.httpServer.Shutdown(shCtx)
-		_ = listener.Close()
-	})
-	defer stop()
-
-	err = server.httpServer.Serve(listener)
-	if err != nil {
-		if errors.Is(err, http.ErrServerClosed) || ctx.Err() != nil {
-			return nil
-		}
-		return fmt.Errorf("serve web: %w", err)
-	}
-	panic("unreachable")
-}
-- 
cgit v1.2.3