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
65 lines
1.3 KiB
Go
65 lines
1.3 KiB
Go
package task_test
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/google/go-cmp/cmp"
|
|
"github.com/xtls/xray-core/common"
|
|
. "github.com/xtls/xray-core/common/task"
|
|
)
|
|
|
|
func TestExecuteParallel(t *testing.T) {
|
|
err := Run(context.Background(),
|
|
func() error {
|
|
time.Sleep(time.Millisecond * 200)
|
|
return errors.New("test")
|
|
}, func() error {
|
|
time.Sleep(time.Millisecond * 500)
|
|
return errors.New("test2")
|
|
})
|
|
|
|
if r := cmp.Diff(err.Error(), "test"); r != "" {
|
|
t.Error(r)
|
|
}
|
|
}
|
|
|
|
func TestExecuteParallelContextCancel(t *testing.T) {
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
err := Run(ctx, func() error {
|
|
time.Sleep(time.Millisecond * 2000)
|
|
return errors.New("test")
|
|
}, func() error {
|
|
time.Sleep(time.Millisecond * 5000)
|
|
return errors.New("test2")
|
|
}, func() error {
|
|
cancel()
|
|
return nil
|
|
})
|
|
|
|
errStr := err.Error()
|
|
if !strings.Contains(errStr, "canceled") {
|
|
t.Error("expected error string to contain 'canceled', but actually not: ", errStr)
|
|
}
|
|
}
|
|
|
|
func BenchmarkExecuteOne(b *testing.B) {
|
|
noop := func() error {
|
|
return nil
|
|
}
|
|
for i := 0; i < b.N; i++ {
|
|
common.Must(Run(context.Background(), noop))
|
|
}
|
|
}
|
|
|
|
func BenchmarkExecuteTwo(b *testing.B) {
|
|
noop := func() error {
|
|
return nil
|
|
}
|
|
for i := 0; i < b.N; i++ {
|
|
common.Must(Run(context.Background(), noop, noop))
|
|
}
|
|
}
|