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
85 lines
1.2 KiB
Go
85 lines
1.2 KiB
Go
package task
|
|
|
|
import (
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
// Periodic is a task that runs periodically.
|
|
type Periodic struct {
|
|
// Interval of the task being run
|
|
Interval time.Duration
|
|
// Execute is the task function
|
|
Execute func() error
|
|
|
|
access sync.Mutex
|
|
timer *time.Timer
|
|
running bool
|
|
}
|
|
|
|
func (t *Periodic) hasClosed() bool {
|
|
t.access.Lock()
|
|
defer t.access.Unlock()
|
|
|
|
return !t.running
|
|
}
|
|
|
|
func (t *Periodic) checkedExecute() error {
|
|
if t.hasClosed() {
|
|
return nil
|
|
}
|
|
|
|
if err := t.Execute(); err != nil {
|
|
t.access.Lock()
|
|
t.running = false
|
|
t.access.Unlock()
|
|
return err
|
|
}
|
|
|
|
t.access.Lock()
|
|
defer t.access.Unlock()
|
|
|
|
if !t.running {
|
|
return nil
|
|
}
|
|
|
|
t.timer = time.AfterFunc(t.Interval, func() {
|
|
t.checkedExecute()
|
|
})
|
|
|
|
return nil
|
|
}
|
|
|
|
// Start implements common.Runnable.
|
|
func (t *Periodic) Start() error {
|
|
t.access.Lock()
|
|
if t.running {
|
|
t.access.Unlock()
|
|
return nil
|
|
}
|
|
t.running = true
|
|
t.access.Unlock()
|
|
|
|
if err := t.checkedExecute(); err != nil {
|
|
t.access.Lock()
|
|
t.running = false
|
|
t.access.Unlock()
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// Close implements common.Closable.
|
|
func (t *Periodic) Close() error {
|
|
t.access.Lock()
|
|
defer t.access.Unlock()
|
|
|
|
t.running = false
|
|
if t.timer != nil {
|
|
t.timer.Stop()
|
|
t.timer = nil
|
|
}
|
|
|
|
return nil
|
|
}
|