|
|
|
|
@@ -222,21 +222,23 @@ func New(address string, memorySize string, diskSize string, diskPath, upstream,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
transport := &http.Transport{
|
|
|
|
|
MaxIdleConns: 100,
|
|
|
|
|
MaxIdleConnsPerHost: 10,
|
|
|
|
|
IdleConnTimeout: 90 * time.Second,
|
|
|
|
|
MaxIdleConns: 200, // Increased from 100
|
|
|
|
|
MaxIdleConnsPerHost: 50, // Increased from 10
|
|
|
|
|
IdleConnTimeout: 120 * time.Second, // Increased from 90s
|
|
|
|
|
DialContext: (&net.Dialer{
|
|
|
|
|
Timeout: 30 * time.Second,
|
|
|
|
|
KeepAlive: 30 * time.Second,
|
|
|
|
|
}).DialContext,
|
|
|
|
|
TLSHandshakeTimeout: 10 * time.Second,
|
|
|
|
|
ResponseHeaderTimeout: 10 * time.Second,
|
|
|
|
|
ExpectContinueTimeout: 1 * time.Second,
|
|
|
|
|
TLSHandshakeTimeout: 15 * time.Second, // Increased from 10s
|
|
|
|
|
ResponseHeaderTimeout: 30 * time.Second, // Increased from 10s
|
|
|
|
|
ExpectContinueTimeout: 5 * time.Second, // Increased from 1s
|
|
|
|
|
DisableCompression: true, // Steam doesn't use compression
|
|
|
|
|
ForceAttemptHTTP2: true, // Enable HTTP/2 if available
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
client := &http.Client{
|
|
|
|
|
Transport: transport,
|
|
|
|
|
Timeout: 60 * time.Second,
|
|
|
|
|
Timeout: 120 * time.Second, // Increased from 60s
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sc := &SteamCache{
|
|
|
|
|
@@ -249,10 +251,12 @@ func New(address string, memorySize string, diskSize string, diskPath, upstream,
|
|
|
|
|
diskgc: dgc,
|
|
|
|
|
client: client,
|
|
|
|
|
server: &http.Server{
|
|
|
|
|
Addr: address,
|
|
|
|
|
ReadTimeout: 5 * time.Second,
|
|
|
|
|
WriteTimeout: 10 * time.Second,
|
|
|
|
|
IdleTimeout: 120 * time.Second,
|
|
|
|
|
Addr: address,
|
|
|
|
|
ReadTimeout: 30 * time.Second, // Increased
|
|
|
|
|
WriteTimeout: 60 * time.Second, // Increased
|
|
|
|
|
IdleTimeout: 120 * time.Second, // Good for keep-alive
|
|
|
|
|
ReadHeaderTimeout: 10 * time.Second, // New, for header attacks
|
|
|
|
|
MaxHeaderBytes: 1 << 20, // 1MB, optional
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -266,7 +270,8 @@ func New(address string, memorySize string, diskSize string, diskPath, upstream,
|
|
|
|
|
|
|
|
|
|
if d != nil {
|
|
|
|
|
if d.Size() > d.Capacity() {
|
|
|
|
|
gc.LRUGC(d, uint(d.Size()-d.Capacity()))
|
|
|
|
|
gcHandler := gc.GetGCAlgorithm(gc.GCAlgorithm(diskGC))
|
|
|
|
|
gcHandler(d, uint(d.Size()-d.Capacity()))
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -277,7 +282,7 @@ func (sc *SteamCache) Run() {
|
|
|
|
|
if sc.upstream != "" {
|
|
|
|
|
resp, err := sc.client.Get(sc.upstream)
|
|
|
|
|
if err != nil || resp.StatusCode != http.StatusOK {
|
|
|
|
|
logger.Logger.Error().Err(err).Str("upstream", sc.upstream).Msg("Failed to connect to upstream server")
|
|
|
|
|
logger.Logger.Error().Err(err).Int("status_code", resp.StatusCode).Str("upstream", sc.upstream).Msg("Failed to connect to upstream server")
|
|
|
|
|
os.Exit(1)
|
|
|
|
|
}
|
|
|
|
|
resp.Body.Close()
|
|
|
|
|
@@ -310,11 +315,6 @@ func (sc *SteamCache) Shutdown() {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (sc *SteamCache) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
if r.URL.Path == "/metrics" {
|
|
|
|
|
promhttp.Handler().ServeHTTP(w, r)
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if r.Method != http.MethodGet {
|
|
|
|
|
requestsTotal.WithLabelValues(r.Method, "405").Inc()
|
|
|
|
|
logger.Logger.Warn().Str("method", r.Method).Msg("Only GET method is supported")
|
|
|
|
|
@@ -322,6 +322,11 @@ func (sc *SteamCache) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if r.URL.Path == "/" {
|
|
|
|
|
w.WriteHeader(http.StatusFound) // this is used by steamcache2's upstream verification at startup
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if r.URL.String() == "/lancache-heartbeat" {
|
|
|
|
|
w.Header().Add("X-LanCache-Processed-By", "SteamCache2")
|
|
|
|
|
w.WriteHeader(http.StatusNoContent)
|
|
|
|
|
@@ -329,6 +334,11 @@ func (sc *SteamCache) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if r.URL.Path == "/metrics" {
|
|
|
|
|
promhttp.Handler().ServeHTTP(w, r)
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if strings.HasPrefix(r.URL.String(), "/depot/") {
|
|
|
|
|
// trim the query parameters from the URL path
|
|
|
|
|
// this is necessary because the cache key should not include query parameters
|
|
|
|
|
@@ -453,18 +463,6 @@ func (sc *SteamCache) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
filename := filepath.Base(cacheKey)
|
|
|
|
|
expectedHash, hasHash := extractHashFromFilename(filename)
|
|
|
|
|
|
|
|
|
|
// Debug logging for manifest files
|
|
|
|
|
if strings.Contains(cacheKey, "manifest") {
|
|
|
|
|
logger.Logger.Debug().
|
|
|
|
|
Str("key", cacheKey).
|
|
|
|
|
Str("filename", filename).
|
|
|
|
|
Bool("hasHash", hasHash).
|
|
|
|
|
Str("expectedHash", expectedHash).
|
|
|
|
|
Int64("content_length_header", resp.ContentLength).
|
|
|
|
|
Int("actual_content_length", len(bodyData)).
|
|
|
|
|
Msg("Manifest file hash verification debug")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Hash verification using Steam's X-Content-Sha header and content length verification
|
|
|
|
|
hashVerified := true
|
|
|
|
|
if hasHash {
|
|
|
|
|
@@ -522,7 +520,6 @@ func (sc *SteamCache) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
Str("key", cacheKey).
|
|
|
|
|
Str("host", r.Host).
|
|
|
|
|
Str("status", "MISS").
|
|
|
|
|
Bool("hash_verified", hasHash).
|
|
|
|
|
Dur("duration", time.Since(tstart)).
|
|
|
|
|
Msg("request")
|
|
|
|
|
|
|
|
|
|
|