merge: PR #4 from feature/roundtrip

feature/roundtrip

Author: quyxishi

VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

cmd/api/main.go

@@ -3,13 +3,15 @@ package main
 import (
 	"context"
 	"fmt"
-	"log"
+	"log/slog"
 	"net/http"
+	"os"
 	"os/signal"
 	"syscall"
 	"time"
 
 	"github.com/quyxishi/whitebox/internal/api"
+	mlog "github.com/quyxishi/whitebox/internal/log"
 )
 
 func gracefulShutdown(apiServer *http.Server, done chan bool) {
@@ -20,24 +22,34 @@ func gracefulShutdown(apiServer *http.Server, done chan bool) {
 	// Listen for the interrupt signal.
 	<-ctx.Done()
 
-	log.Println("Shutting down gracefully, press Ctrl+C again to force")
+	slog.Info("Shutting down gracefully, press Ctrl+C again to force")
 	stop() // Allow Ctrl+C to force shutdown
 
 	// The context is used to inform the server it has 5 seconds to finish
 	// the request it is currently handling
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 	if err := apiServer.Shutdown(ctx); err != nil {
-		log.Printf("Server forced to shutdown with error: %v", err)
+		slog.Error("Server forced to shutdown", "due", err.Error())
 	}
 
-	log.Println("Server exiting")
+	slog.Info("Server exiting")
 
 	// Notify the main goroutine that the shutdown is complete
 	done <- true
 }
 
 func main() {
+	opts := mlog.ModuleHandlerOptions{
+		SlogOpts: slog.HandlerOptions{
+			Level: slog.LevelDebug,
+		},
+	}
+	handler := mlog.NewModuleHandler(os.Stdout, &opts)
+	slog.SetDefault(slog.New(handler))
+
+	// *
+
 	server := api.NewServer()
 
 	// Create a done channel to signal when the shutdown is complete
@@ -53,5 +65,5 @@ func main() {
 
 	// Wait for the graceful shutdown to complete
 	<-done
-	log.Println("Graceful shutdown complete.")
+	slog.Info("Graceful shutdown complete.")
 }

go.mod

@@ -78,7 +78,7 @@ require (
 	golang.org/x/arch v0.23.0 // indirect
 	golang.org/x/crypto v0.45.0 // indirect
 	golang.org/x/mod v0.29.0 // indirect
-	golang.org/x/net v0.47.0 // indirect
+	golang.org/x/net v0.47.0
 	golang.org/x/sync v0.18.0 // indirect
 	golang.org/x/sys v0.38.0 // indirect
 	golang.org/x/text v0.31.0 // indirect

internal/api/v1/error_handler.go

@@ -1,7 +1,7 @@
 package v1
 
 import (
-	"log"
+	"log/slog"
 	"net/http"
 	"runtime/debug"
 
@@ -12,7 +12,7 @@ func GlobalErrorHandler() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		defer func() {
 			if err := recover(); err != nil {
-				log.Printf("[ERROR] %v\n%s\n", err, string(debug.Stack()))
+				slog.Error("unexpected", "error", err, "stackTrace", string(debug.Stack()))
 				c.String(http.StatusInternalServerError, "Unexpected error: %v", err)
 				c.Abort()
 			}

internal/api/v1/probe/counter.go

@@ -0,0 +1,29 @@
+package probe
+
+import (
+	"io"
+	"net/http"
+)
+
+type ByteCounter struct {
+	io.ReadCloser
+	n int64
+}
+
+func (h *ByteCounter) Read(p []byte) (int, error) {
+	n, err := h.ReadCloser.Read(p)
+	h.n += int64(n)
+	return n, err
+}
+
+type RedirectCounter struct {
+	Total int
+	Max   int
+}
+
+func (h *RedirectCounter) CheckRedirect(req *http.Request, via []*http.Request) error {
+	if h.Total = len(via); h.Total > h.Max {
+		return http.ErrUseLastResponse
+	}
+	return nil
+}