mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-17 21:15: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
105 lines
1.8 KiB
Go
105 lines
1.8 KiB
Go
package pubsub
|
|
|
|
import (
|
|
"errors"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/xtls/xray-core/common"
|
|
"github.com/xtls/xray-core/common/signal/done"
|
|
"github.com/xtls/xray-core/common/task"
|
|
)
|
|
|
|
type Subscriber struct {
|
|
buffer chan interface{}
|
|
done *done.Instance
|
|
}
|
|
|
|
func (s *Subscriber) push(msg interface{}) {
|
|
select {
|
|
case s.buffer <- msg:
|
|
default:
|
|
}
|
|
}
|
|
|
|
func (s *Subscriber) Wait() <-chan interface{} {
|
|
return s.buffer
|
|
}
|
|
|
|
func (s *Subscriber) Close() error {
|
|
return s.done.Close()
|
|
}
|
|
|
|
func (s *Subscriber) IsClosed() bool {
|
|
return s.done.Done()
|
|
}
|
|
|
|
type Service struct {
|
|
sync.RWMutex
|
|
subs map[string][]*Subscriber
|
|
ctask *task.Periodic
|
|
}
|
|
|
|
func NewService() *Service {
|
|
s := &Service{
|
|
subs: make(map[string][]*Subscriber),
|
|
}
|
|
s.ctask = &task.Periodic{
|
|
Execute: s.Cleanup,
|
|
Interval: time.Second * 30,
|
|
}
|
|
return s
|
|
}
|
|
|
|
// Cleanup cleans up internal caches of subscribers.
|
|
// Visible for testing only.
|
|
func (s *Service) Cleanup() error {
|
|
s.Lock()
|
|
defer s.Unlock()
|
|
|
|
if len(s.subs) == 0 {
|
|
return errors.New("nothing to do")
|
|
}
|
|
|
|
for name, subs := range s.subs {
|
|
newSub := make([]*Subscriber, 0, len(s.subs))
|
|
for _, sub := range subs {
|
|
if !sub.IsClosed() {
|
|
newSub = append(newSub, sub)
|
|
}
|
|
}
|
|
if len(newSub) == 0 {
|
|
delete(s.subs, name)
|
|
} else {
|
|
s.subs[name] = newSub
|
|
}
|
|
}
|
|
|
|
if len(s.subs) == 0 {
|
|
s.subs = make(map[string][]*Subscriber)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (s *Service) Subscribe(name string) *Subscriber {
|
|
sub := &Subscriber{
|
|
buffer: make(chan interface{}, 16),
|
|
done: done.New(),
|
|
}
|
|
s.Lock()
|
|
s.subs[name] = append(s.subs[name], sub)
|
|
s.Unlock()
|
|
common.Must(s.ctask.Start())
|
|
return sub
|
|
}
|
|
|
|
func (s *Service) Publish(name string, message interface{}) {
|
|
s.RLock()
|
|
defer s.RUnlock()
|
|
|
|
for _, sub := range s.subs[name] {
|
|
if !sub.IsClosed() {
|
|
sub.push(message)
|
|
}
|
|
}
|
|
}
|