mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-16 12:35:54 +00:00
1. **Fixed XPadding Placement Dropdown**: - Added the missing `cookie` and `query` options to `xPaddingPlacement` (`stream_xhttp.html`). - *Why:* Previously, users wanting `cookie` obfuscation were forced to use the `header` placement string. This caused Xray-core to blindly intercept the entire monolithic HTTP Cookie header, failing internal padding-length validations and causing the inbound to silently drop the connection. 2. **Fixed Uplink Data Placement Validation**: - Replaced the unsupported `query` option with `cookie` in `uplinkDataPlacement`. - *Why:* Xray-core's `transport_internet.go` explicitly forbids `query` as an uplink placement option. Selecting it from the UI previously sent a payload that would cause Xray-core to instantly throw an `unsupported uplink data placement: query` panic. Adding `cookie` perfectly aligns the UI with Xray-core restrictions. ### Related Issues - Resolves #3992
62 lines
1.4 KiB
Go
62 lines
1.4 KiB
Go
package retry // import "github.com/xtls/xray-core/common/retry"
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/xtls/xray-core/common/errors"
|
|
)
|
|
|
|
var ErrRetryFailed = errors.New("all retry attempts failed")
|
|
|
|
// Strategy is a way to retry on a specific function.
|
|
type Strategy interface {
|
|
// On performs a retry on a specific function, until it doesn't return any error.
|
|
On(func() error) error
|
|
}
|
|
|
|
type retryer struct {
|
|
totalAttempt int
|
|
nextDelay func() uint32
|
|
}
|
|
|
|
// On implements Strategy.On.
|
|
func (r *retryer) On(method func() error) error {
|
|
attempt := 0
|
|
accumulatedError := make([]error, 0, r.totalAttempt)
|
|
for attempt < r.totalAttempt {
|
|
err := method()
|
|
if err == nil {
|
|
return nil
|
|
}
|
|
numErrors := len(accumulatedError)
|
|
if numErrors == 0 || err.Error() != accumulatedError[numErrors-1].Error() {
|
|
accumulatedError = append(accumulatedError, err)
|
|
}
|
|
delay := r.nextDelay()
|
|
time.Sleep(time.Duration(delay) * time.Millisecond)
|
|
attempt++
|
|
}
|
|
return errors.New(accumulatedError).Base(ErrRetryFailed)
|
|
}
|
|
|
|
// Timed returns a retry strategy with fixed interval.
|
|
func Timed(attempts int, delay uint32) Strategy {
|
|
return &retryer{
|
|
totalAttempt: attempts,
|
|
nextDelay: func() uint32 {
|
|
return delay
|
|
},
|
|
}
|
|
}
|
|
|
|
func ExponentialBackoff(attempts int, delay uint32) Strategy {
|
|
nextDelay := uint32(0)
|
|
return &retryer{
|
|
totalAttempt: attempts,
|
|
nextDelay: func() uint32 {
|
|
r := nextDelay
|
|
nextDelay += delay
|
|
return r
|
|
},
|
|
}
|
|
}
|