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

minor changes (#922)

Browse Source 
* ipv6 for family Protection

* warp - ForceIP

* fix bug in edit SOCKS and HTTP outbound

Co-Authored-By: Saeid <43953720+surbiks@users.noreply.github.com>

* lang - export inbound

* reset button - publicKey & psk

* fix - Ensure logs are not null in show method

---------

Co-authored-by: Saeid <43953720+surbiks@users.noreply.github.com>
This commit is contained in:
Ho3ein
2024-02-13 21:06:25 +03:30
committed by GitHub
parent 288c0b982a
commit b829ebca2b
12 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/assets/js/model/outbound.js
View File

@@ -860,13 +860,13 @@ Outbound.SocksSettings = class extends CommonClass {
}
static fromJson(json={}) {
servers = json.servers;
let servers = json.servers;
if(ObjectUtil.isArrEmpty(servers)) servers=[{users: [{}]}];
return new Outbound.SocksSettings(
servers[0].address,
servers[0].port,
ObjectUtil.isArrEmpty(servers[0].users) ? '' : servers[0].users[0].user,
ObjectUtil.isArrEmpty(servers[0].pass) ? '' : servers[0].users[0].pass,
ObjectUtil.isArrEmpty(servers[0].users) ? '' : servers[0].users[0].pass,
);
}
@@ -890,13 +890,13 @@ Outbound.HttpSettings = class extends CommonClass {
}
static fromJson(json={}) {
servers = json.servers;
let servers = json.servers;
if(ObjectUtil.isArrEmpty(servers)) servers=[{users: [{}]}];
return new Outbound.HttpSettings(
servers[0].address,
servers[0].port,
ObjectUtil.isArrEmpty(servers[0].users) ? '' : servers[0].users[0].user,
ObjectUtil.isArrEmpty(servers[0].pass) ? '' : servers[0].users[0].pass,
ObjectUtil.isArrEmpty(servers[0].users) ? '' : servers[0].users[0].pass,
);
}
@@ -912,7 +912,7 @@ Outbound.HttpSettings = class extends CommonClass {
};
Outbound.WireguardSettings = class extends CommonClass {
constructor(
mtu=1420, secretKey=Wireguard.generateKeypair().privateKey,
mtu=1420, secretKey='',
address='', workers=2, domainStrategy='', reserved='',
peers=[new Outbound.WireguardSettings.Peer()], kernelMode=false) {
super();

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

@@ -2098,7 +2098,7 @@ Inbound.WireguardSettings = class extends XrayCommonClass {
};
Inbound.WireguardSettings.Peer = class extends XrayCommonClass {
constructor(publicKey='', psk='', allowedIPs=['0.0.0.0/0','::/0'], keepAlive=0) {
constructor(publicKey=Wireguard.generateKeypair().publicKey, psk='', allowedIPs=['0.0.0.0/0','::/0'], keepAlive=0) {
super();
this.publicKey = publicKey;
this.psk = psk;