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
64 lines
1.1 KiB
Go
64 lines
1.1 KiB
Go
package task
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/xtls/xray-core/common/signal/semaphore"
|
|
)
|
|
|
|
// OnSuccess executes g() after f() returns nil.
|
|
func OnSuccess(f func() error, g func() error) func() error {
|
|
return func() error {
|
|
if err := f(); err != nil {
|
|
return err
|
|
}
|
|
return g()
|
|
}
|
|
}
|
|
|
|
// Run executes a list of tasks in parallel, returns the first error encountered or nil if all tasks pass.
|
|
func Run(ctx context.Context, tasks ...func() error) error {
|
|
n := len(tasks)
|
|
s := semaphore.New(n)
|
|
done := make(chan error, 1)
|
|
|
|
for _, task := range tasks {
|
|
<-s.Wait()
|
|
go func(f func() error) {
|
|
err := f()
|
|
if err == nil {
|
|
s.Signal()
|
|
return
|
|
}
|
|
|
|
select {
|
|
case done <- err:
|
|
default:
|
|
}
|
|
}(task)
|
|
}
|
|
|
|
/*
|
|
if altctx := ctx.Value("altctx"); altctx != nil {
|
|
ctx = altctx.(context.Context)
|
|
}
|
|
*/
|
|
|
|
for i := 0; i < n; i++ {
|
|
select {
|
|
case err := <-done:
|
|
return err
|
|
case <-ctx.Done():
|
|
return ctx.Err()
|
|
case <-s.Wait():
|
|
}
|
|
}
|
|
|
|
/*
|
|
if cancel := ctx.Value("cancel"); cancel != nil {
|
|
cancel.(context.CancelFunc)()
|
|
}
|
|
*/
|
|
|
|
return nil
|
|
}
|