Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/MHSanaei/3x-ui.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlolka1333 <xtrafcyz@gmail.com>2026-04-19 22:01:00 +0300
committerGitHub <noreply@github.com>2026-04-19 22:01:00 +0300
commitfec714a2431c482024a0952982fa36f38935e7ed (patch)
treecb2e206b375a725623a0c0b18a22785d44037d67 /web/service
parente02f78ac68e96066288c5da0c38e293160b23143 (diff)
fix: enhance WebSocket stability, resolve XHTTP configurations and fix UI loading shifts (#3997)
* feat: implement real-time traffic monitoring and UI updates using a high-performance WebSocket hub and background job system * feat: add bulk client management support and improve inbound data handling * Fix bug * **Fixes & Changes:** 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 * This commit fixes structural payload issues preventing XHTTP from functioning correctly and eliminates WebSocket log spam. - **[Fix X-Padding UI]** Added missing `cookie` and `query` options to X-Padding Placement. Fixes the issue where using Cookie fallback triggers whole HTTP Cookie header interception and silent drop in Xray-core. (Resolves [#3992](https://github.com/MHSanaei/3x-ui/issues/3992)) - **[Fix Uplink Data Options]** Replaced the invalid `query` option with `cookie` in Uplink Data Placement dropdown to prevent Xray-core backend panic `unsupported uplink data placement: query`. - **[Fix WebSockets Spam]** Boosted `maxMessageSize` boundary to 100MB and gracefully handled fallback fetch signals via `broadcastInvalidate` to avoid buffer dropping spam. (Resolves [#3984](https://github.com/MHSanaei/3x-ui/issues/3984)) * Fix * gofmt * fix(websocket): resolve channel race condition and graceful shutdown deadlock * Fix: inbounds switch * Change max quantity from 10000 to 500 * fix
Diffstat (limited to 'web/service')
-rw-r--r--web/service/xray.go40
1 files changed, 22 insertions, 18 deletions
diff --git a/web/service/xray.go b/web/service/xray.go
index 511ffdda..be140ce6 100644
--- a/web/service/xray.go
+++ b/web/service/xray.go
@@ -118,31 +118,35 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
json.Unmarshal([]byte(inbound.Settings), &settings)
clients, ok := settings["clients"].([]any)
if ok {
- // check users active or not
+ // Fast O(N) lookup map for client traffic enablement
clientStats := inbound.ClientStats
+ enableMap := make(map[string]bool, len(clientStats))
for _, clientTraffic := range clientStats {
- indexDecrease := 0
- for index, client := range clients {
- c := client.(map[string]any)
- if c["email"] == clientTraffic.Email {
- if !clientTraffic.Enable {
- clients = RemoveIndex(clients, index-indexDecrease)
- indexDecrease++
- logger.Infof("Remove Inbound User %s due to expiration or traffic limit", c["email"])
- }
- }
- }
+ enableMap[clientTraffic.Email] = clientTraffic.Enable
}
- // clear client config for additional parameters
+ // filter and clean clients
var final_clients []any
for _, client := range clients {
- c := client.(map[string]any)
- if c["enable"] != nil {
- if enable, ok := c["enable"].(bool); ok && !enable {
- continue
- }
+ c, ok := client.(map[string]any)
+ if !ok {
+ continue
}
+
+ email, _ := c["email"].(string)
+
+ // check users active or not via stats
+ if enable, exists := enableMap[email]; exists && !enable {
+ logger.Infof("Remove Inbound User %s due to expiration or traffic limit", email)
+ continue
+ }
+
+ // check manual disabled flag
+ if manualEnable, ok := c["enable"].(bool); ok && !manualEnable {
+ continue
+ }
+
+ // clear client config for additional parameters
for key := range c {
if key != "email" && key != "id" && key != "password" && key != "flow" && key != "method" {
delete(c, key)