mirror of
https://github.com/bitechdev/ResolveSpec.git
synced 2026-07-03 09:47:38 +00:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d648614611 | |||
| 3f86eb0f06 | |||
| 3dac55cb19 | |||
| bbb2c6d127 |
@@ -50,6 +50,10 @@ type ServerInstanceConfig struct {
|
|||||||
// GZIP enables GZIP compression middleware
|
// GZIP enables GZIP compression middleware
|
||||||
GZIP bool `mapstructure:"gzip"`
|
GZIP bool `mapstructure:"gzip"`
|
||||||
|
|
||||||
|
// HTTP2 enables HTTP/2 with the Extended CONNECT protocol (RFC 8441) for WebSocket support.
|
||||||
|
// Requires TLS; pair with SSLCert/SSLKey, SelfSignedSSL, or AutoTLS.
|
||||||
|
HTTP2 bool `mapstructure:"http2"`
|
||||||
|
|
||||||
// TLS/HTTPS configuration options (mutually exclusive)
|
// TLS/HTTPS configuration options (mutually exclusive)
|
||||||
// Option 1: Provide certificate and key files directly
|
// Option 1: Provide certificate and key files directly
|
||||||
SSLCert string `mapstructure:"ssl_cert"`
|
SSLCert string `mapstructure:"ssl_cert"`
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ func FromConfigInstanceToServerConfig(sic *config.ServerInstanceConfig, handler
|
|||||||
Description: sic.Description,
|
Description: sic.Description,
|
||||||
Handler: handler,
|
Handler: handler,
|
||||||
GZIP: sic.GZIP,
|
GZIP: sic.GZIP,
|
||||||
|
HTTP2: sic.HTTP2,
|
||||||
|
|
||||||
SSLCert: sic.SSLCert,
|
SSLCert: sic.SSLCert,
|
||||||
SSLKey: sic.SSLKey,
|
SSLKey: sic.SSLKey,
|
||||||
|
|||||||
@@ -19,6 +19,10 @@ type Config struct {
|
|||||||
// GZIP compression support
|
// GZIP compression support
|
||||||
GZIP bool
|
GZIP bool
|
||||||
|
|
||||||
|
// HTTP2 enables HTTP/2 with the Extended CONNECT protocol (RFC 8441) for WebSocket support.
|
||||||
|
// Requires TLS; pair with SSLCert/SSLKey, SelfSignedSSL, or AutoTLS.
|
||||||
|
HTTP2 bool
|
||||||
|
|
||||||
// TLS/HTTPS configuration options (mutually exclusive)
|
// TLS/HTTPS configuration options (mutually exclusive)
|
||||||
// Option 1: Provide certificate and key files directly
|
// Option 1: Provide certificate and key files directly
|
||||||
SSLCert string
|
SSLCert string
|
||||||
@@ -38,6 +42,10 @@ type Config struct {
|
|||||||
// AutoTLSEmail is the email for Let's Encrypt registration (optional but recommended)
|
// AutoTLSEmail is the email for Let's Encrypt registration (optional but recommended)
|
||||||
AutoTLSEmail string
|
AutoTLSEmail string
|
||||||
|
|
||||||
|
// PanicHandler is called when a request handler panics.
|
||||||
|
// If nil, the default middleware.PanicRecovery is used (logs, records metric, returns 500).
|
||||||
|
PanicHandler func(w http.ResponseWriter, r *http.Request, rcv any)
|
||||||
|
|
||||||
// Graceful shutdown configuration
|
// Graceful shutdown configuration
|
||||||
// ShutdownTimeout is the maximum time to wait for graceful shutdown
|
// ShutdownTimeout is the maximum time to wait for graceful shutdown
|
||||||
// Default: 30 seconds
|
// Default: 30 seconds
|
||||||
|
|||||||
+48
-10
@@ -8,6 +8,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
"syscall"
|
"syscall"
|
||||||
@@ -451,8 +452,19 @@ func newInstance(cfg Config) (*serverInstance, error) {
|
|||||||
handler = gz(handler)
|
handler = gz(handler)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wrap with the panic recovery middleware
|
// Wrap with panic recovery — use caller-supplied handler if provided
|
||||||
handler = middleware.PanicRecovery(handler)
|
if cfg.PanicHandler != nil {
|
||||||
|
handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
defer func() {
|
||||||
|
if rcv := recover(); rcv != nil {
|
||||||
|
cfg.PanicHandler(w, r, rcv)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
handler.ServeHTTP(w, r)
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
handler = middleware.PanicRecovery(handler)
|
||||||
|
}
|
||||||
|
|
||||||
// Configure TLS if any TLS option is enabled
|
// Configure TLS if any TLS option is enabled
|
||||||
tlsConfig, certFile, keyFile, err := configureTLS(cfg)
|
tlsConfig, certFile, keyFile, err := configureTLS(cfg)
|
||||||
@@ -461,15 +473,41 @@ func newInstance(cfg Config) (*serverInstance, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Create gracefulServer
|
// Create gracefulServer
|
||||||
|
httpServer := &http.Server{
|
||||||
|
Addr: addr,
|
||||||
|
Handler: handler,
|
||||||
|
ReadTimeout: cfg.ReadTimeout,
|
||||||
|
WriteTimeout: cfg.WriteTimeout,
|
||||||
|
IdleTimeout: cfg.IdleTimeout,
|
||||||
|
TLSConfig: tlsConfig,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Enable HTTP/2 with Extended CONNECT (RFC 8441) for WebSocket-over-H2 support.
|
||||||
|
// The GODEBUG=http2xconnect=1 flag is read by net/http's init(); setting it here
|
||||||
|
// ensures it propagates to subprocesses and any future process restarts.
|
||||||
|
// For the current process, set GODEBUG=http2xconnect=1 in the environment before launch.
|
||||||
|
if httpServer.Protocols == nil {
|
||||||
|
httpServer.Protocols = &http.Protocols{}
|
||||||
|
}
|
||||||
|
if cfg.HTTP2 {
|
||||||
|
if existing := os.Getenv("GODEBUG"); !strings.Contains(existing, "http2xconnect=1") {
|
||||||
|
if existing == "" {
|
||||||
|
os.Setenv("GODEBUG", "http2xconnect=1")
|
||||||
|
} else {
|
||||||
|
os.Setenv("GODEBUG", existing+",http2xconnect=1")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if httpServer.HTTP2 == nil {
|
||||||
|
httpServer.HTTP2 = &http.HTTP2Config{}
|
||||||
|
}
|
||||||
|
httpServer.Protocols.SetHTTP2(true)
|
||||||
|
httpServer.Protocols.SetUnencryptedHTTP2(true)
|
||||||
|
} else {
|
||||||
|
httpServer.Protocols.SetHTTP2(false)
|
||||||
|
}
|
||||||
|
|
||||||
gracefulSrv := &gracefulServer{
|
gracefulSrv := &gracefulServer{
|
||||||
server: &http.Server{
|
server: httpServer,
|
||||||
Addr: addr,
|
|
||||||
Handler: handler,
|
|
||||||
ReadTimeout: cfg.ReadTimeout,
|
|
||||||
WriteTimeout: cfg.WriteTimeout,
|
|
||||||
IdleTimeout: cfg.IdleTimeout,
|
|
||||||
TLSConfig: tlsConfig,
|
|
||||||
},
|
|
||||||
shutdownTimeout: cfg.ShutdownTimeout,
|
shutdownTimeout: cfg.ShutdownTimeout,
|
||||||
drainTimeout: cfg.DrainTimeout,
|
drainTimeout: cfg.DrainTimeout,
|
||||||
shutdownComplete: make(chan struct{}),
|
shutdownComplete: make(chan struct{}),
|
||||||
|
|||||||
Reference in New Issue
Block a user