diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js index 0a615977..b3127706 100644 --- a/web/assets/js/model/xray.js +++ b/web/assets/js/model/xray.js @@ -1097,11 +1097,6 @@ class Inbound extends XrayCommonClass { const params = new Map(); params.set("type", this.stream.network); params.set("security", this.stream.security); - if (this.XTLS) { - params.set("security", "xtls"); - } else { - params.set("security", this.stream.security); - } switch (type) { case "tcp": const tcp = this.stream.tcp; @@ -1147,30 +1142,25 @@ class Inbound extends XrayCommonClass { break; } - if (this.stream.security === 'tls') { + if (this.tls) { + params.set("fp" , this.stream.tls.settings[0]['fingerprint']); + params.set("alpn", this.stream.tls.alpn[0]); if (!ObjectUtil.isEmpty(this.stream.tls.server)) { address = this.stream.tls.server; - params.set("fp" , this.stream.tls.settings[0]['fingerprint']); - params.set("alpn", this.stream.tls.alpn[0]); - if (this.stream.tls.settings[0]['serverName'] !== ''){ - params.set("sni", this.stream.tls.settings[0]['serverName']); - } - else{ - params.set("sni", address); - } - if (type === "tcp" && this.settings.vlesses[clientIndex].flow.length > 0) { - params.set("flow", this.settings.vlesses[clientIndex].flow); - } } + if (this.stream.tls.settings[0]['serverName'] !== ''){ + params.set("sni", this.stream.tls.settings[0]['serverName']); + } + if (type === "tcp" && this.settings.vlesses[clientIndex].flow.length > 0) { + params.set("flow", this.settings.vlesses[clientIndex].flow); + } } if (this.xtls) { - if (this.stream.security === 'xtls') { - if (!ObjectUtil.isEmpty(this.stream.tls.server)) { - address = this.stream.tls.server; - if (type === "tcp") { - params.set("flow", this.settings.vlesses[clientIndex].flow); - } + if (!ObjectUtil.isEmpty(this.stream.tls.server)) { + address = this.stream.tls.server; + if (type === "tcp") { + params.set("flow", this.settings.vlesses[clientIndex].flow); } } } @@ -1203,6 +1193,8 @@ class Inbound extends XrayCommonClass { const port = this.port; const type = this.stream.network; const params = new Map(); + params.set("type", this.stream.network); + params.set("security", this.stream.security); switch (type) { case "tcp": const tcp = this.stream.tcp; @@ -1248,21 +1240,18 @@ class Inbound extends XrayCommonClass { break; } - if (this.stream.security === 'tls') { + if (this.tls) { + params.set("fp" , this.stream.tls.settings[0]['fingerprint']); + params.set("alpn", this.stream.tls.alpn[0]); if (!ObjectUtil.isEmpty(this.stream.tls.server)) { address = this.stream.tls.server; - params.set("fp" , this.stream.tls.settings[0]['fingerprint']); - params.set("alpn", this.stream.tls.alpn[0]); - if (this.stream.tls.settings[0]['serverName'] !== ''){ - params.set("sni", this.stream.tls.settings[0]['serverName']); - } - else{ - params.set("sni", address); } + if (this.stream.tls.settings[0]['serverName'] !== ''){ + params.set("sni", this.stream.tls.settings[0]['serverName']); } } - if (this.stream.security === 'xtls') { + if (this.xtls) { if (!ObjectUtil.isEmpty(this.stream.tls.server)) { address = this.stream.tls.server; if (type === "tcp" && this.settings.trojans[clientIndex].flow.length > 0) { diff --git a/web/html/common/qrcode_modal.html b/web/html/common/qrcode_modal.html index 6c9afbb3..e535b401 100644 --- a/web/html/common/qrcode_modal.html +++ b/web/html/common/qrcode_modal.html @@ -32,15 +32,13 @@ } this.visible = true; qrModalApp.$nextTick(() => { - if (this.clipboard === null) { - this.clipboard = new ClipboardJS('#qr-modal-ok-btn', { - text: () => this.copyText, - }); - this.clipboard.on('success', () => { - app.$message.success('{{ i18n "copied" }}') - this.clipboard.destroy(); - }); - } + this.clipboard = new ClipboardJS('#qr-modal-ok-btn', { + text: () => this.copyText, + }); + this.clipboard.on('success', () => { + app.$message.success('{{ i18n "copied" }}') + this.clipboard.destroy(); + }); if (this.qrcode === null) { this.qrcode = new QRious({ element: document.querySelector('#qrCode'), diff --git a/web/html/xui/setting.html b/web/html/xui/setting.html index 17f76cb0..0c0f9682 100644 --- a/web/html/xui/setting.html +++ b/web/html/xui/setting.html @@ -40,7 +40,7 @@ - +