Skip to content

Commit b7f4765

Browse files
MHSanaeiMHSanaei
committed
bug fixed
1 parent 40c2f52 commit b7f4765

3 files changed

Lines changed: 29 additions & 42 deletions

File tree

‎web/assets/js/model/xray.js‎

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,11 +1097,6 @@ class Inbound extends XrayCommonClass {
10971097
const params = new Map();
10981098
params.set("type", this.stream.network);
10991099
params.set("security", this.stream.security);
1100-
if (this.XTLS) {
1101-
params.set("security", "xtls");
1102-
} else {
1103-
params.set("security", this.stream.security);
1104-
}
11051100
switch (type) {
11061101
case "tcp":
11071102
const tcp = this.stream.tcp;
@@ -1147,30 +1142,25 @@ class Inbound extends XrayCommonClass {
11471142
break;
11481143
}
11491144

1150-
if (this.stream.security === 'tls') {
1145+
if (this.tls) {
1146+
params.set("fp" , this.stream.tls.settings[0]['fingerprint']);
1147+
params.set("alpn", this.stream.tls.alpn[0]);
11511148
if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
11521149
address = this.stream.tls.server;
1153-
params.set("fp" , this.stream.tls.settings[0]['fingerprint']);
1154-
params.set("alpn", this.stream.tls.alpn[0]);
1155-
if (this.stream.tls.settings[0]['serverName'] !== ''){
1156-
params.set("sni", this.stream.tls.settings[0]['serverName']);
1157-
}
1158-
else{
1159-
params.set("sni", address);
1160-
}
1161-
if (type === "tcp" && this.settings.vlesses[clientIndex].flow.length > 0) {
1162-
params.set("flow", this.settings.vlesses[clientIndex].flow);
1163-
}
11641150
}
1151+
if (this.stream.tls.settings[0]['serverName'] !== ''){
1152+
params.set("sni", this.stream.tls.settings[0]['serverName']);
1153+
}
1154+
if (type === "tcp" && this.settings.vlesses[clientIndex].flow.length > 0) {
1155+
params.set("flow", this.settings.vlesses[clientIndex].flow);
1156+
}
11651157
}
11661158

11671159
if (this.xtls) {
1168-
if (this.stream.security === 'xtls') {
1169-
if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
1170-
address = this.stream.tls.server;
1171-
if (type === "tcp") {
1172-
params.set("flow", this.settings.vlesses[clientIndex].flow);
1173-
}
1160+
if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
1161+
address = this.stream.tls.server;
1162+
if (type === "tcp") {
1163+
params.set("flow", this.settings.vlesses[clientIndex].flow);
11741164
}
11751165
}
11761166
}
@@ -1203,6 +1193,8 @@ class Inbound extends XrayCommonClass {
12031193
const port = this.port;
12041194
const type = this.stream.network;
12051195
const params = new Map();
1196+
params.set("type", this.stream.network);
1197+
params.set("security", this.stream.security);
12061198
switch (type) {
12071199
case "tcp":
12081200
const tcp = this.stream.tcp;
@@ -1248,21 +1240,18 @@ class Inbound extends XrayCommonClass {
12481240
break;
12491241
}
12501242

1251-
if (this.stream.security === 'tls') {
1243+
if (this.tls) {
1244+
params.set("fp" , this.stream.tls.settings[0]['fingerprint']);
1245+
params.set("alpn", this.stream.tls.alpn[0]);
12521246
if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
12531247
address = this.stream.tls.server;
1254-
params.set("fp" , this.stream.tls.settings[0]['fingerprint']);
1255-
params.set("alpn", this.stream.tls.alpn[0]);
1256-
if (this.stream.tls.settings[0]['serverName'] !== ''){
1257-
params.set("sni", this.stream.tls.settings[0]['serverName']);
1258-
}
1259-
else{
1260-
params.set("sni", address);
12611248
}
1249+
if (this.stream.tls.settings[0]['serverName'] !== ''){
1250+
params.set("sni", this.stream.tls.settings[0]['serverName']);
12621251
}
12631252
}
12641253

1265-
if (this.stream.security === 'xtls') {
1254+
if (this.xtls) {
12661255
if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
12671256
address = this.stream.tls.server;
12681257
if (type === "tcp" && this.settings.trojans[clientIndex].flow.length > 0) {

‎web/html/common/qrcode_modal.html‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,13 @@
3232
}
3333
this.visible = true;
3434
qrModalApp.$nextTick(() => {
35-
if (this.clipboard === null) {
36-
this.clipboard = new ClipboardJS('#qr-modal-ok-btn', {
37-
text: () => this.copyText,
38-
});
39-
this.clipboard.on('success', () => {
40-
app.$message.success('{{ i18n "copied" }}')
41-
this.clipboard.destroy();
42-
});
43-
}
35+
this.clipboard = new ClipboardJS('#qr-modal-ok-btn', {
36+
text: () => this.copyText,
37+
});
38+
this.clipboard.on('success', () => {
39+
app.$message.success('{{ i18n "copied" }}')
40+
this.clipboard.destroy();
41+
});
4442
if (this.qrcode === null) {
4543
this.qrcode = new QRious({
4644
element: document.querySelector('#qrCode'),

‎web/html/xui/setting.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
<a-list item-layout="horizontal" :style="siderDrawer.isDarkTheme ? 'color: hsla(0,0%,100%,.65);': 'background: white;'">
4242
<setting-list-item type="text" title='{{ i18n "pages.setting.panelListeningIP"}}' desc='{{ i18n "pages.setting.panelListeningIPDesc"}}' v-model="allSetting.webListen"></setting-list-item>
43-
<setting-list-item type="number" title='{{ i18n "pages.setting.panelPort"}}' desc='{{ i18n "pages.setting.panelPortDesc"}}' v-model.number="allSetting.webPort"></setting-list-item>
43+
<setting-list-item type="text" title='{{ i18n "pages.setting.panelPort"}}' desc='{{ i18n "pages.setting.panelPortDesc"}}' v-model.number="allSetting.webPort"></setting-list-item>
4444
<setting-list-item type="text" title='{{ i18n "pages.setting.publicKeyPath"}}' desc='{{ i18n "pages.setting.publicKeyPathDesc"}}' v-model="allSetting.webCertFile"></setting-list-item>
4545
<setting-list-item type="text" title='{{ i18n "pages.setting.privateKeyPath"}}' desc='{{ i18n "pages.setting.privateKeyPathDesc"}}' v-model="allSetting.webKeyFile"></setting-list-item>
4646
<setting-list-item type="text" title='{{ i18n "pages.setting.panelUrlPath"}}' desc='{{ i18n "pages.setting.panelUrlPathDesc"}}' v-model="allSetting.webBasePath"></setting-list-item>

0 commit comments

Comments
 (0)