Remnents baking

infra/conf/dokodemo.go

@@ -1,7 +1,6 @@
 package conf
 
 import (
-	"github.com/xtls/xray-core/common/errors"
 	"github.com/xtls/xray-core/proxy/dokodemo"
 	"google.golang.org/protobuf/proto"
 )
@@ -12,9 +11,6 @@ type DokodemoConfig struct {
 	NetworkList  *NetworkList `json:"network"`
 	Redirect     bool         `json:"followRedirect"`
 	UserLevel    uint32       `json:"userLevel"`
-
-	// Deprecated. Remove before v26.x, for feature error trigger.
-	TimeoutValue uint32       `json:"timeout"`
 }
 
 func (v *DokodemoConfig) Build() (proto.Message, error) {
@@ -24,12 +20,6 @@ func (v *DokodemoConfig) Build() (proto.Message, error) {
 	}
 	config.Port = uint32(v.PortValue)
 	config.Networks = v.NetworkList.Build()
-	if v.TimeoutValue > 0 {  // Remove before v26.x
-		// After feature removal, change to PrintRemovedFeatureError, and keep it before v26.x
-		errors.PrintDeprecatedFeatureWarning("timeout config in dokodemo-door", "userLevel")
-		// Remove one line below before v25.x
-		config.Timeout = v.TimeoutValue
-	}
 	config.FollowRedirect = v.Redirect
 	config.UserLevel = v.UserLevel
 	return config, nil

infra/conf/http.go

@@ -26,18 +26,10 @@ type HTTPServerConfig struct {
 	Accounts    []*HTTPAccount `json:"accounts"`
 	Transparent bool           `json:"allowTransparent"`
 	UserLevel   uint32         `json:"userLevel"`
-
-	// Deprecated. Remove before v26.x, for feature error trigger.
-	Timeout     uint32         `json:"timeout"`
 }
 
 func (c *HTTPServerConfig) Build() (proto.Message, error) {
-	if c.Timeout > 0 {  // Remove before v26.x
-		// Change this to PrintRemovedFeatureError before v25.x
-		errors.PrintDeprecatedFeatureWarning("Timeout config in HTTP server", "userLevel")
-	}
 	config := &http.ServerConfig{
-		Timeout:          c.Timeout,    // Remove before v25.x
 		AllowTransparent: c.Transparent,
 		UserLevel:        c.UserLevel,
 	}

infra/conf/trojan.go

@@ -95,9 +95,6 @@ type TrojanUserConfig struct {
 type TrojanServerConfig struct {
 	Clients   []*TrojanUserConfig      `json:"clients"`
 	Fallbacks []*TrojanInboundFallback `json:"fallbacks"`
-
-	// Remove in v25.x
-	Fallback  *TrojanInboundFallback   `json:"fallback"`
 }
 
 // Build implements Buildable
@@ -120,9 +117,6 @@ func (c *TrojanServerConfig) Build() (proto.Message, error) {
 		}
 	}
 
-	if c.Fallback != nil {  // Remove in v25.x
-		return nil, errors.PrintRemovedFeatureError(`"fallback":{} in Trojan`, `"fallbacks":[{}]`)
-	}
 	for _, fb := range c.Fallbacks {
 		var i uint16
 		var s string

infra/conf/vless.go

@@ -32,9 +32,6 @@ type VLessInboundConfig struct {
 	Clients    []json.RawMessage       `json:"clients"`
 	Decryption string                  `json:"decryption"`
 	Fallbacks  []*VLessInboundFallback `json:"fallbacks"`
-
-	// Remove in v25.x
-	Fallback   *VLessInboundFallback   `json:"fallback"`
 }
 
 // Build implements Buildable
@@ -76,9 +73,6 @@ func (c *VLessInboundConfig) Build() (proto.Message, error) {
 	}
 	config.Decryption = c.Decryption
 
-	if c.Fallback != nil {  // Remove in v25.x
-		return nil, errors.PrintRemovedFeatureError(`"fallback":{} in VLESS`, `"fallbacks":[{}]`)
-	}
 	for _, fb := range c.Fallbacks {
 		var i uint16
 		var s string

proxy/dokodemo/config.proto

@@ -16,9 +16,6 @@ message Config {
   // List of networks that the Dokodemo accepts.
   repeated xray.common.net.Network networks = 7;
 
-  // Deprecated and should use policy level
-  // Remove before v25.x
-  uint32 timeout = 4 [deprecated = true];
   bool follow_redirect = 5;
   uint32 user_level = 6;
 }

proxy/dokodemo/dokodemo.go

@@ -62,10 +62,6 @@ func (d *DokodemoDoor) Network() []net.Network {
 func (d *DokodemoDoor) policy() policy.Session {
 	config := d.config
 	p := d.policyManager.ForLevel(config.UserLevel)
-	if config.Timeout > 0 && config.UserLevel == 0 {  // Remove or change this logic before v25.x
-		errors.PrintDeprecatedFeatureWarning(`timeout config in dokodemo`, ``)
-		p.Timeouts.ConnectionIdle = time.Duration(config.Timeout) * time.Second
-	}
 	return p
 }
 

proxy/http/config.proto

@@ -18,8 +18,6 @@ message ServerConfig {
   map<string, string> accounts = 2;
   bool allow_transparent = 3;
   uint32 user_level = 4;
-  // Deprecated, remove before v25.x
-  uint32 timeout = 1 [deprecated = true];
 }
 
 message Header {

proxy/http/server.go

@@ -46,10 +46,6 @@ func NewServer(ctx context.Context, config *ServerConfig) (*Server, error) {
 func (s *Server) policy() policy.Session {
 	config := s.config
 	p := s.policyManager.ForLevel(config.UserLevel)
-	if config.Timeout > 0 && config.UserLevel == 0 {  // Remove this before v25.x
-		errors.PrintDeprecatedFeatureWarning(`timeout config in HTTP inbound`, ``)
-		p.Timeouts.ConnectionIdle = time.Duration(config.Timeout) * time.Second
-	}
 	return p
 }