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:
authorMHSanaei <ho3ein.sanaei@gmail.com>2023-04-19 11:25:38 +0300
committerMHSanaei <ho3ein.sanaei@gmail.com>2023-04-19 11:25:38 +0300
commite1132a3f416eb0a894fd2dc9aaf9e29c0d93098f (patch)
tree60939cef5248d6d30cdf622b7481764db25d5240 /web/assets/js
parent4d479102ad8ecf309ec340f9e0778f1231788185 (diff)
bug fix
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
Diffstat (limited to 'web/assets/js')
-rw-r--r--web/assets/js/model/xray.js11
1 files changed, 6 insertions, 5 deletions
diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js
index 3e3ff9cb..573f2f88 100644
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -853,6 +853,7 @@ class StreamSettings extends XrayCommonClass {
}
static fromJson(json={}) {
+
return new StreamSettings(
json.network,
json.security,
@@ -1412,13 +1413,13 @@ class Inbound extends XrayCommonClass {
if (!ObjectUtil.isArrEmpty(this.stream.reality.serverNames)) {
params.set("sni", this.stream.reality.serverNames.split(",")[0]);
}
- if (this.stream.network === 'tcp') {
+ if (this.stream.network === 'tcp' && !ObjectUtil.isEmpty(this.settings.vlesses[clientIndex].flow)) {
params.set("flow", this.settings.vlesses[clientIndex].flow);
}
- if (this.stream.reality.shortIds != "") {
+ if (this.stream.reality.shortIds.length > 0) {
params.set("sid", this.stream.reality.shortIds.split(",")[0]);
}
- if (this.stream.reality.settings.fingerprint != "") {
+ if (!ObjectUtil.isEmpty(this.stream.reality.fingerprint)) {
params.set("fp", this.stream.reality.settings.fingerprint);
}
if (!ObjectUtil.isEmpty(this.stream.reality.settings.serverName)) {
@@ -1519,10 +1520,10 @@ class Inbound extends XrayCommonClass {
if (!ObjectUtil.isEmpty(this.stream.reality.settings.serverName)) {
address = this.stream.reality.settings.serverName;
}
- if (this.stream.reality.shortIds != "") {
+ if (this.stream.reality.shortIds.length > 0) {
params.set("sid", this.stream.reality.shortIds.split(",")[0]);
}
- if (this.stream.reality.settings.fingerprint != "") {
+ if (!ObjectUtil.isEmpty(this.stream.reality.fingerprint)) {
params.set("fp", this.stream.reality.settings.fingerprint);
}
if (!ObjectUtil.isEmpty(this.stream.reality.settings.serverName)) {