gandc/x-ui
1
0
Fork 0
mirror of https://github.com/alireza0/x-ui.git synced 2026-03-21 08:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

v1.5.4

Browse Source 
Plus some fixes and decoration
This commit is contained in:
Alireza Ahmadi
2023-08-25 23:56:50 +02:00
parent da5253d98c
commit a6199526da
10 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
web/assets/js/model/xray.js
View File

@@ -686,6 +686,7 @@ class SockoptStreamSettings extends XrayCommonClass {
}
static fromJson(json = {}) {
if (Object.keys(json).length === 0) return undefined;
return new SockoptStreamSettings(
json.acceptProxyProtocol,
json.tcpFastOpen,
@@ -1458,10 +1459,10 @@ class Inbound extends XrayCommonClass {
JSON.parse(this.settings).clients.forEach((client,index) => {
if(this.tls && !ObjectUtil.isArrEmpty(this.stream.tls.settings.domains)){
this.stream.tls.settings.domains.forEach((domain) => {
link += this.genLink(domain.domain, remark + '-' + client.email + '-' + domain.remark, index) + '\r\n';
link += this.genLink(domain.domain, [remark, client.email, domain.remark].filter(x => x.length > 0).join('-'), index) + '\r\n';
});
} else {
link += this.genLink(address, remark + '-' + client.email, index) + '\r\n';
link += this.genLink(address, [remark, client.email].filter(x => x.length > 0).join('-'), index) + '\r\n';
}
});
return link;