diff --git a/web/assets/js/model/inbound.js b/web/assets/js/model/inbound.js index f74b2736..c4416e59 100644 --- a/web/assets/js/model/inbound.js +++ b/web/assets/js/model/inbound.js @@ -323,18 +323,16 @@ class KcpStreamSettings extends XrayCommonClass { tti = 20, uplinkCapacity = 5, downlinkCapacity = 20, - congestion = false, - readBufferSize = 1, - writeBufferSize = 1, + cwndMultiplier = 0, + maxSendingWindow = 0, ) { super(); this.mtu = mtu; this.tti = tti; this.upCap = uplinkCapacity; this.downCap = downlinkCapacity; - this.congestion = congestion; - this.readBuffer = readBufferSize; - this.writeBuffer = writeBufferSize; + this.cwndMultiplier = cwndMultiplier; + this.maxSendingWindow = maxSendingWindow; } static fromJson(json = {}) { @@ -343,9 +341,8 @@ class KcpStreamSettings extends XrayCommonClass { json.tti, json.uplinkCapacity, json.downlinkCapacity, - json.congestion, - json.readBufferSize, - json.writeBufferSize, + json.cwndMultiplier, + json.maxSendingWindow, ); } @@ -355,9 +352,8 @@ class KcpStreamSettings extends XrayCommonClass { tti: this.tti, uplinkCapacity: this.upCap, downlinkCapacity: this.downCap, - congestion: this.congestion, - readBufferSize: this.readBuffer, - writeBufferSize: this.writeBuffer, + cwndMultiplier: this.cwndMultiplier, + maxSendingWindow: this.maxSendingWindow, }; } } diff --git a/web/assets/js/model/outbound.js b/web/assets/js/model/outbound.js index c0e7b03d..9d2c080b 100644 --- a/web/assets/js/model/outbound.js +++ b/web/assets/js/model/outbound.js @@ -169,18 +169,16 @@ class KcpStreamSettings extends CommonClass { tti = 20, uplinkCapacity = 5, downlinkCapacity = 20, - congestion = false, - readBufferSize = 1, - writeBufferSize = 1, + cwndMultiplier = 0, + maxSendingWindow = 0, ) { super(); this.mtu = mtu; this.tti = tti; this.upCap = uplinkCapacity; this.downCap = downlinkCapacity; - this.congestion = congestion; - this.readBuffer = readBufferSize; - this.writeBuffer = writeBufferSize; + this.cwndMultiplier = cwndMultiplier; + this.maxSendingWindow = maxSendingWindow; } static fromJson(json = {}) { @@ -189,9 +187,8 @@ class KcpStreamSettings extends CommonClass { json.tti, json.uplinkCapacity, json.downlinkCapacity, - json.congestion, - json.readBufferSize, - json.writeBufferSize, + json.cwndMultiplier, + json.maxSendingWindow, ); } @@ -201,9 +198,8 @@ class KcpStreamSettings extends CommonClass { tti: this.tti, uplinkCapacity: this.upCap, downlinkCapacity: this.downCap, - congestion: this.congestion, - readBufferSize: this.readBuffer, - writeBufferSize: this.writeBuffer, + cwndMultiplier: this.cwndMultiplier, + maxSendingWindow: this.maxSendingWindow, }; } } diff --git a/web/html/form/outbound.html b/web/html/form/outbound.html index 0deb8ee1..fe76b518 100644 --- a/web/html/form/outbound.html +++ b/web/html/form/outbound.html @@ -1,19 +1,36 @@ {{define "form/outbound"}} - + - + - - [[ y - ]] + + [[ y ]] - - + + @@ -21,74 +38,115 @@ @@ -156,17 +231,30 @@ - - [[ wds ]] + + [[ wds ]] - - + + - - + + - + @@ -174,19 +262,34 @@ Reserved + + Reserved - + - - Peer [[ index + 1 ]] + + + Peer [[ index + 1 ]] + @@ -200,17 +303,33 @@ - @@ -221,65 +340,109 @@ - + -