mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-16 12:35:54 +00:00
367152556a
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
67 lines
1.6 KiB
Go
67 lines
1.6 KiB
Go
package router
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/xtls/xray-core/app/observatory"
|
|
"github.com/xtls/xray-core/common"
|
|
"github.com/xtls/xray-core/common/errors"
|
|
"github.com/xtls/xray-core/core"
|
|
"github.com/xtls/xray-core/features/extension"
|
|
)
|
|
|
|
type LeastPingStrategy struct {
|
|
ctx context.Context
|
|
observatory extension.Observatory
|
|
}
|
|
|
|
func (l *LeastPingStrategy) GetPrincipleTarget(strings []string) []string {
|
|
return []string{l.PickOutbound(strings)}
|
|
}
|
|
|
|
func (l *LeastPingStrategy) InjectContext(ctx context.Context) {
|
|
l.ctx = ctx
|
|
common.Must(core.RequireFeatures(l.ctx, func(observatory extension.Observatory) error {
|
|
l.observatory = observatory
|
|
return nil
|
|
}))
|
|
}
|
|
|
|
func (l *LeastPingStrategy) PickOutbound(strings []string) string {
|
|
if l.observatory == nil {
|
|
errors.LogError(l.ctx, "observer is nil")
|
|
return ""
|
|
}
|
|
observeReport, err := l.observatory.GetObservation(l.ctx)
|
|
if err != nil {
|
|
errors.LogInfoInner(l.ctx, err, "cannot get observer report")
|
|
return ""
|
|
}
|
|
outboundsList := outboundList(strings)
|
|
if result, ok := observeReport.(*observatory.ObservationResult); ok {
|
|
status := result.Status
|
|
leastPing := int64(99999999)
|
|
selectedOutboundName := ""
|
|
for _, v := range status {
|
|
if outboundsList.contains(v.OutboundTag) && v.Alive && v.Delay < leastPing {
|
|
selectedOutboundName = v.OutboundTag
|
|
leastPing = v.Delay
|
|
}
|
|
}
|
|
return selectedOutboundName
|
|
}
|
|
|
|
// No way to understand observeReport
|
|
return ""
|
|
}
|
|
|
|
type outboundList []string
|
|
|
|
func (o outboundList) contains(name string) bool {
|
|
for _, v := range o {
|
|
if v == name {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|