Introduce server config method(s)

.golangci.yml

@@ -1,4 +1,13 @@
 linters-settings:
+  revive:
+    rules:
+      # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#exported
+      - name: exported
+        severity: warning
+        disabled: false
+        exclude: [""]
+        arguments:
+          - "disableStutteringCheck"
   exhaustive:
     default-signifies-exhaustive: true
   errcheck:

examples/echo/main.go

@@ -30,7 +30,8 @@ func main() {
 	})
 	channel := channel.NewChannel("/", dispatcher, channel.NewConnectionRegistry(), channel.WithOriginPatterns("*"))
 
-	server := server.NewServer(Addr, server.WithBaseContext(context.Background()), server.WithProfilerEndpoint())
+	server := server.NewServer(Addr, server.DefaultServerConfig, server.WithBaseContext(context.Background()), server.WithProfilerEndpoint())
+
 	server.AddChannel(channel)
 
 	if err := server.Run(); err != nil {

examples/http_backend/main.go

@@ -36,7 +36,7 @@ func main() {
 
 	channel := channel.NewChannel("/", dispatcher, channel.NewConnectionRegistry(), channel.WithOriginPatterns("*"))
 
-	server := server.NewServer(Addr, server.WithBaseContext(context.Background()))
+	server := server.NewServer(Addr, server.DefaultServerConfig, server.WithBaseContext(context.Background()))
 	server.AddChannel(channel)
 
 	if err := server.Run(); err != nil {

examples/passthrough/main.go

@@ -42,7 +42,7 @@ func main() {
 	})
 	channel := channel.NewChannel("/", dispatcher, channel.NewConnectionRegistry(), channel.WithOriginPatterns("*"))
 
-	server := server.NewServer(Addr, server.WithBaseContext(context.Background()))
+	server := server.NewServer(Addr, server.DefaultServerConfig, server.WithBaseContext(context.Background()))
 	server.AddChannel(channel)
 
 	if err := server.Run(); err != nil {

server/server.go

@@ -27,18 +27,13 @@ import (
 	"fmt"
 	"net"
 	"net/http"
+	"reflect"
 	"sync"
-	"time"
 
 	"github.com/ksysoev/wasabi"
 	"golang.org/x/exp/slog"
 )
 
-const (
-	ReadHeaderTimeout = 3 * time.Second
-	ReadTimeout       = 30 * time.Second
-)
-
 var ErrServerAlreadyRunning = fmt.Errorf("server is already running")
 
 type Server struct {
@@ -69,7 +64,7 @@ func WithReadinessChan(ch chan<- struct{}) Option {
 // NewServer creates new instance of Wasabi server
 // port - port to listen on
 // returns new instance of Server
-func NewServer(addr string, opts ...Option) *Server {
+func NewServer(addr string, serverConfig ServerConfig, opts ...Option) *Server {
 	if addr == "" {
 		addr = ":http"
 	}
@@ -88,16 +83,23 @@ func NewServer(addr string, opts ...Option) *Server {
 
 	server.handler = &http.Server{
 		Addr:              addr,
-		ReadHeaderTimeout: ReadHeaderTimeout,
-		ReadTimeout:       ReadTimeout,
+		ReadHeaderTimeout: serverConfig.ReadHeaderTimeout,
+		ReadTimeout:       serverConfig.ReadTimeout,
 		BaseContext: func(_ net.Listener) context.Context {
 			return server.baseCtx
 		},
 	}
 
+	server.ApplyServerConfig(serverConfig)
+
 	return server
 }
 
+// Applies the ServerConfig as a value in the baseCtx of the server
+func (s *Server) ApplyServerConfig(serverConfig ServerConfig) {
+	s.baseCtx = context.WithValue(s.baseCtx, reflect.TypeOf(serverConfig), serverConfig)
+}
+
 // AddChannel adds new channel to server
 func (s *Server) AddChannel(channel wasabi.Channel) {
 	s.channels = append(s.channels, channel)

server/server_config.go

@@ -0,0 +1,19 @@
+package server
+
+import (
+	"time"
+)
+
+type ServerConfig struct {
+	ReadHeaderTimeout time.Duration
+	ReadTimeout       time.Duration
+}
+
+var DefaultServerConfig = ServerConfig{
+	ReadHeaderTimeout: ReadHeaderTimeoutSeconds * time.Second,
+	ReadTimeout:       ReadTimeoutSeconds * time.Second,
+}
+
+const ReadHeaderTimeoutSeconds = 3
+
+const ReadTimeoutSeconds = 30

server/server_test.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"net/http"
 	"os"
+	"reflect"
 	"testing"
 	"time"
 
@@ -19,7 +20,7 @@ type testCtxKey string
 
 func TestNewServer(t *testing.T) {
 	addr := ":8080"
-	server := NewServer(addr)
+	server := NewServer(addr, DefaultServerConfig)
 
 	if server.addr != addr {
 		t.Errorf("Expected port %s, but got %s", addr, server.addr)
@@ -33,15 +34,15 @@ func TestNewServer(t *testing.T) {
 		t.Error("Expected non-nil mutex")
 	}
 
-	server = NewServer("")
+	server = NewServer("", DefaultServerConfig)
 
 	if server.addr != ":http" {
 		t.Errorf("Expected default port :http, but got %s", server.addr)
 	}
 }
 func TestServer_AddChannel(t *testing.T) {
 	// Create a new Server instance
-	server := NewServer(":0")
+	server := NewServer(":0", DefaultServerConfig)
 
 	// Create a new channel
 	channel := mocks.NewMockChannel(t)
@@ -64,7 +65,7 @@ func TestServer_WithBaseContext(t *testing.T) {
 	// Create a new Server instance with a base context
 	ctx := context.WithValue(context.Background(), testCtxKey("test"), "test")
 
-	server := NewServer(":0", WithBaseContext(ctx))
+	server := NewServer(":0", DefaultServerConfig, WithBaseContext(ctx))
 
 	// Check if the base context was set correctly
 	if server.baseCtx == nil {
@@ -74,12 +75,17 @@ func TestServer_WithBaseContext(t *testing.T) {
 	if server.baseCtx.Value(testCtxKey("test")) != "test" {
 		t.Errorf("Expected context value 'test', but got '%s'", server.baseCtx.Value("test"))
 	}
+
+	// Check that server config is part of context
+	if server.baseCtx.Value(reflect.TypeFor[ServerConfig]()) != DefaultServerConfig {
+		t.Errorf("Expected context to key value ServerConfig with value '%s' but got '%s'", DefaultServerConfig, server.baseCtx.Value(reflect.TypeFor[ServerConfig]()))
+	}
 }
 
 func TestServer_WithReadinessChan(t *testing.T) {
 	// Create a new Server instance with a base context
 	ready := make(chan struct{})
-	server := NewServer(":0", WithReadinessChan(ready))
+	server := NewServer(":0", DefaultServerConfig, WithReadinessChan(ready))
 
 	if server.ready == nil {
 		t.Error("Expected non-nil channel")
@@ -99,7 +105,7 @@ func TestServer_Run(t *testing.T) {
 		t.Run(fmt.Sprintf("%d times of calling Run", run), func(t *testing.T) {
 			// Create a new Server instance
 			ready := make(chan struct{})
-			server := NewServer(":0", WithReadinessChan(ready))
+			server := NewServer(":0", DefaultServerConfig, WithReadinessChan(ready))
 
 			channel := mocks.NewMockChannel(t)
 			channel.EXPECT().Path().Return("/test")
@@ -152,7 +158,7 @@ func TestServer_Run(t *testing.T) {
 func TestServer_Close(t *testing.T) {
 	// Create a new Server instance
 	ready := make(chan struct{})
-	server := NewServer(":0", WithReadinessChan(ready))
+	server := NewServer(":0", DefaultServerConfig, WithReadinessChan(ready))
 
 	// Create a context with a timeout
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
@@ -202,7 +208,7 @@ func TestServer_Close(t *testing.T) {
 func TestServer_Close_NoContext(t *testing.T) {
 	// Create a new Server instance
 	ready := make(chan struct{})
-	server := NewServer(":0", WithReadinessChan(ready))
+	server := NewServer(":0", DefaultServerConfig, WithReadinessChan(ready))
 
 	// Create a mock channel
 	channel := mocks.NewMockChannel(t)
@@ -249,7 +255,7 @@ func TestServer_Addr(t *testing.T) {
 	// Create a new Server instance
 	done := make(chan struct{})
 
-	server := NewServer(":0", WithReadinessChan(done))
+	server := NewServer(":0", DefaultServerConfig, WithReadinessChan(done))
 
 	defer server.Close()
 
@@ -284,7 +290,7 @@ func TestServer_Addr(t *testing.T) {
 }
 func TestServer_WithTLS(t *testing.T) {
 	// Create a new Server instance
-	server := NewServer(":0")
+	server := NewServer(":0", DefaultServerConfig)
 	// Set TLS configuration using WithTLS
 	certPath := "/path/to/cert.pem"
 	keyPath := "/path/to/key.pem"
@@ -323,7 +329,7 @@ func TestServer_WithTLS(t *testing.T) {
 func TestServer_WithProfilerEndpoint(t *testing.T) {
 	ready := make(chan struct{})
 	// Create a new Server instance
-	server := NewServer(":0", WithReadinessChan(ready))
+	server := NewServer(":0", DefaultServerConfig, WithReadinessChan(ready))
 
 	// Check if the profiler endpoint is disabled by default
 	if server.pprofEnabled {

tests/echo_test.go

@@ -28,7 +28,7 @@ func TestEcho(t *testing.T) {
 	ch := channel.NewChannel("/", dispatcher, channel.NewConnectionRegistry(), channel.WithOriginPatterns("*"))
 
 	ready := make(chan struct{})
-	s := server.NewServer(":0", server.WithBaseContext(context.Background()), server.WithReadinessChan(ready))
+	s := server.NewServer(":0", server.DefaultServerConfig, server.WithBaseContext(context.Background()), server.WithReadinessChan(ready))
 	s.AddChannel(ch)
 
 	go func() {