mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-16 20:45:50 +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
85 lines
1.4 KiB
Go
85 lines
1.4 KiB
Go
package signal
|
|
|
|
import (
|
|
"context"
|
|
"sync"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
"github.com/xtls/xray-core/common"
|
|
"github.com/xtls/xray-core/common/task"
|
|
)
|
|
|
|
type ActivityUpdater interface {
|
|
Update()
|
|
}
|
|
|
|
type ActivityTimer struct {
|
|
mu sync.RWMutex
|
|
updated chan struct{}
|
|
checkTask *task.Periodic
|
|
onTimeout func()
|
|
consumed atomic.Bool
|
|
once sync.Once
|
|
}
|
|
|
|
func (t *ActivityTimer) Update() {
|
|
select {
|
|
case t.updated <- struct{}{}:
|
|
default:
|
|
}
|
|
}
|
|
|
|
func (t *ActivityTimer) check() error {
|
|
select {
|
|
case <-t.updated:
|
|
default:
|
|
t.finish()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (t *ActivityTimer) finish() {
|
|
t.once.Do(func() {
|
|
t.consumed.Store(true)
|
|
t.mu.Lock()
|
|
defer t.mu.Unlock()
|
|
|
|
common.CloseIfExists(t.checkTask)
|
|
t.onTimeout()
|
|
})
|
|
}
|
|
|
|
func (t *ActivityTimer) SetTimeout(timeout time.Duration) {
|
|
if t.consumed.Load() {
|
|
return
|
|
}
|
|
if timeout == 0 {
|
|
t.finish()
|
|
return
|
|
}
|
|
|
|
t.mu.Lock()
|
|
defer t.mu.Unlock()
|
|
// double check, just in case
|
|
if t.consumed.Load() {
|
|
return
|
|
}
|
|
newCheckTask := &task.Periodic{
|
|
Interval: timeout,
|
|
Execute: t.check,
|
|
}
|
|
common.CloseIfExists(t.checkTask)
|
|
t.checkTask = newCheckTask
|
|
t.Update()
|
|
common.Must(newCheckTask.Start())
|
|
}
|
|
|
|
func CancelAfterInactivity(ctx context.Context, cancel context.CancelFunc, timeout time.Duration) *ActivityTimer {
|
|
timer := &ActivityTimer{
|
|
updated: make(chan struct{}, 1),
|
|
onTimeout: cancel,
|
|
}
|
|
timer.SetTimeout(timeout)
|
|
return timer
|
|
}
|