gandc/x-ui
1
0
Fork 0
mirror of https://github.com/alireza0/x-ui.git synced 2026-03-14 05:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

better finalmask

Browse Source
This commit is contained in:
Alireza Ahmadi
2026-02-01 12:43:46 +01:00
parent 94c4becb34
commit 1904a7b85c
2 changed files with 65 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
web/assets/js/model/inbound.js
View File

@@ -969,7 +969,7 @@ class SockoptStreamSettings extends XrayCommonClass {
} }
} }
class FinalMask extends XrayCommonClass { class UdpMask extends XrayCommonClass {
constructor(type = 'salamander', settings = {}) { constructor(type = 'salamander', settings = {}) {
super(); super();
this.type = type; this.type = type;
@@ -997,20 +997,34 @@ class FinalMask extends XrayCommonClass {
} }
static fromJson(json = {}) { static fromJson(json = {}) {
return new FinalMask( return new UdpMask(
json.type || 'salamander', json.type || 'salamander',
json.settings || {} json.settings || {}
); );
} }
toJson() { toJson() {
const result = { return {
type: this.type type: this.type,
settings: (this.settings && Object.keys(this.settings).length > 0) ? this.settings : undefined
}; };
if (this.settings && Object.keys(this.settings).length > 0) {
result.settings = this.settings;
} }
return result; }
class FinalMaskStreamSettings extends XrayCommonClass {
constructor(udp = []) {
super();
this.udp = Array.isArray(udp) ? udp.map(u => new UdpMask(u.type, u.settings)) : [new UdpMask(udp.type, udp.settings)];
}
static fromJson(json = {}) {
return new FinalMaskStreamSettings(json.udp || []);
}
toJson() {
return {
udp: this.udp.map(udp => udp.toJson())
};
} }
} }
@@ -1026,7 +1040,7 @@ class StreamSettings extends XrayCommonClass {
grpcSettings = new GrpcStreamSettings(), grpcSettings = new GrpcStreamSettings(),
httpupgradeSettings = new HttpUpgradeStreamSettings(), httpupgradeSettings = new HttpUpgradeStreamSettings(),
xhttpSettings = new xHTTPStreamSettings(), xhttpSettings = new xHTTPStreamSettings(),
finalmask = { udp: [] }, finalmask = new FinalMaskStreamSettings(),
sockopt = undefined, sockopt = undefined,
) { ) {
super(); super();
@@ -1046,10 +1060,7 @@ class StreamSettings extends XrayCommonClass {
} }
addUdpMask(type = 'salamander') { addUdpMask(type = 'salamander') {
if (!this.finalmask.udp) { this.finalmask.udp.push(new UdpMask(type));
this.finalmask.udp = [];
}
this.finalmask.udp.push(new FinalMask(type));
} }
delUdpMask(index) { delUdpMask(index) {
@@ -1058,6 +1069,10 @@ class StreamSettings extends XrayCommonClass {
} }
} }
get hasFinalMask() {
return this.finalmask.udp && this.finalmask.udp.length > 0;
}
get isTls() { get isTls() {
return this.security === "tls"; return this.security === "tls";
} }
@@ -1092,14 +1107,6 @@ class StreamSettings extends XrayCommonClass {
} }
static fromJson(json = {}) { static fromJson(json = {}) {
let finalmask = { udp: [] };
if (json.finalmask) {
if (Array.isArray(json.finalmask)) {
finalmask.udp = json.finalmask.map(mask => FinalMask.fromJson(mask));
} else if (json.finalmask.udp) {
finalmask.udp = json.finalmask.udp.map(mask => FinalMask.fromJson(mask));
}
}
return new StreamSettings( return new StreamSettings(
json.network, json.network,
json.security, json.security,
@@ -1112,7 +1119,7 @@ class StreamSettings extends XrayCommonClass {
GrpcStreamSettings.fromJson(json.grpcSettings), GrpcStreamSettings.fromJson(json.grpcSettings),
HttpUpgradeStreamSettings.fromJson(json.httpupgradeSettings), HttpUpgradeStreamSettings.fromJson(json.httpupgradeSettings),
xHTTPStreamSettings.fromJson(json.xhttpSettings), xHTTPStreamSettings.fromJson(json.xhttpSettings),
finalmask, FinalMaskStreamSettings.fromJson(json.finalmask),
SockoptStreamSettings.fromJson(json.sockopt), SockoptStreamSettings.fromJson(json.sockopt),
); );
} }
@@ -1131,9 +1138,7 @@ class StreamSettings extends XrayCommonClass {
grpcSettings: network === 'grpc' ? this.grpc.toJson() : undefined, grpcSettings: network === 'grpc' ? this.grpc.toJson() : undefined,
httpupgradeSettings: network === 'httpupgrade' ? this.httpupgrade.toJson() : undefined, httpupgradeSettings: network === 'httpupgrade' ? this.httpupgrade.toJson() : undefined,
xhttpSettings: network === 'xhttp' ? this.xhttp.toJson() : undefined, xhttpSettings: network === 'xhttp' ? this.xhttp.toJson() : undefined,
finalmask: (this.finalmask.udp && this.finalmask.udp.length > 0) ? { finalmask: this.hasFinalMask ? this.finalmask.toJson() : undefined,
udp: this.finalmask.udp.map(mask => mask.toJson())
} : undefined,
sockopt: this.sockopt != undefined ? this.sockopt.toJson() : undefined, sockopt: this.sockopt != undefined ? this.sockopt.toJson() : undefined,
}; };
} }

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

@@ -551,7 +551,7 @@ class SockoptStreamSettings extends CommonClass {
} }
} }
class FinalMask extends CommonClass { class UdpMask extends CommonClass {
constructor(type = 'salamander', settings = {}) { constructor(type = 'salamander', settings = {}) {
super(); super();
this.type = type; this.type = type;
@@ -579,20 +579,34 @@ class FinalMask extends CommonClass {
} }
static fromJson(json = {}) { static fromJson(json = {}) {
return new FinalMask( return new UdpMask(
json.type || 'salamander', json.type || 'salamander',
json.settings || {} json.settings || {}
); );
} }
toJson() { toJson() {
const result = { return {
type: this.type type: this.type,
settings: (this.settings && Object.keys(this.settings).length > 0) ? this.settings : undefined
}; };
if (this.settings && Object.keys(this.settings).length > 0) {
result.settings = this.settings;
} }
return result; }
class FinalMaskStreamSettings extends CommonClass {
constructor(udp = []) {
super();
this.udp = Array.isArray(udp) ? udp.map(u => new UdpMask(u.type, u.settings)) : [new UdpMask(udp.type, udp.settings)];
}
static fromJson(json = {}) {
return new FinalMaskStreamSettings(json.udp || []);
}
toJson() {
return {
udp: this.udp.map(udp => udp.toJson())
};
} }
} }
@@ -609,7 +623,7 @@ class StreamSettings extends CommonClass {
httpupgradeSettings = new HttpUpgradeStreamSettings(), httpupgradeSettings = new HttpUpgradeStreamSettings(),
xhttpSettings = new xHTTPStreamSettings(), xhttpSettings = new xHTTPStreamSettings(),
hysteriaSettings = new HysteriaStreamSettings(), hysteriaSettings = new HysteriaStreamSettings(),
finalmask = { udp: [] }, finalmask = new FinalMaskStreamSettings(),
sockopt = undefined, sockopt = undefined,
) { ) {
super(); super();
@@ -629,10 +643,7 @@ class StreamSettings extends CommonClass {
} }
addUdpMask(type = 'salamander') { addUdpMask(type = 'salamander') {
if (!this.finalmask.udp) { this.finalmask.udp.push(new UdpMask(type));
this.finalmask.udp = [];
}
this.finalmask.udp.push(new FinalMask(type));
} }
delUdpMask(index) { delUdpMask(index) {
@@ -641,6 +652,10 @@ class StreamSettings extends CommonClass {
} }
} }
get hasFinalMask() {
return this.finalmask.udp && this.finalmask.udp.length > 0;
}
get isTls() { get isTls() {
return this.security === 'tls'; return this.security === 'tls';
} }
@@ -658,14 +673,6 @@ class StreamSettings extends CommonClass {
} }
static fromJson(json = {}) { static fromJson(json = {}) {
let finalmask = { udp: [] };
if (json.finalmask) {
if (Array.isArray(json.finalmask)) {
finalmask.udp = json.finalmask.map(mask => FinalMask.fromJson(mask));
} else if (json.finalmask.udp) {
finalmask.udp = json.finalmask.udp.map(mask => FinalMask.fromJson(mask));
}
}
return new StreamSettings( return new StreamSettings(
json.network, json.network,
json.security, json.security,
@@ -678,7 +685,7 @@ class StreamSettings extends CommonClass {
HttpUpgradeStreamSettings.fromJson(json.httpupgradeSettings), HttpUpgradeStreamSettings.fromJson(json.httpupgradeSettings),
xHTTPStreamSettings.fromJson(json.xhttpSettings), xHTTPStreamSettings.fromJson(json.xhttpSettings),
HysteriaStreamSettings.fromJson(json.hysteriaSettings), HysteriaStreamSettings.fromJson(json.hysteriaSettings),
finalmask, FinalMaskStreamSettings.fromJson(json.finalmask),
SockoptStreamSettings.fromJson(json.sockopt), SockoptStreamSettings.fromJson(json.sockopt),
); );
} }
@@ -697,9 +704,7 @@ class StreamSettings extends CommonClass {
httpupgradeSettings: network === 'httpupgrade' ? this.httpupgrade.toJson() : undefined, httpupgradeSettings: network === 'httpupgrade' ? this.httpupgrade.toJson() : undefined,
xhttpSettings: network === 'xhttp' ? this.xhttp.toJson() : undefined, xhttpSettings: network === 'xhttp' ? this.xhttp.toJson() : undefined,
hysteriaSettings: network === 'hysteria' ? this.hysteria.toJson() : undefined, hysteriaSettings: network === 'hysteria' ? this.hysteria.toJson() : undefined,
finalmask: (this.finalmask.udp && this.finalmask.udp.length > 0) ? { finalmask: this.hasFinalMask ? this.finalmask.toJson() : undefined,
udp: this.finalmask.udp.map(mask => mask.toJson())
} : undefined,
sockopt: this.sockopt != undefined ? this.sockopt.toJson() : undefined, sockopt: this.sockopt != undefined ? this.sockopt.toJson() : undefined,
}; };
} }
@@ -793,7 +798,7 @@ class Outbound extends CommonClass {
canEnableMux() { canEnableMux() {
// Disable Mux if flow is set // Disable Mux if flow is set
if (this.settings.flow && this.settings.flow !== '') { if (this.settings?.flow && this.settings.flow !== '') {
this.mux.enabled = false; this.mux.enabled = false;
return false; return false;
} }
@@ -1045,7 +1050,10 @@ class Outbound extends CommonClass {
stream.hysteria.disablePathMTUDiscovery = urlParams.get('disablePathMTUDiscovery') === 'true'; stream.hysteria.disablePathMTUDiscovery = urlParams.get('disablePathMTUDiscovery') === 'true';
} }
if (urlParams.has('obfs')) { if (urlParams.has('obfs')) {
stream.udpmasks[0] = new UdpMask(urlParams.get('obfs'), urlParams.get('obfs-password')); stream.finalmask = new FinalMaskStreamSettings([{
type: urlParams.get('obfs'),
settings: { password: urlParams.get('obfs-password') ?? '' }
}] );
} }
if (urlParams.has('security')){ if (urlParams.has('security')){
stream.security = urlParams.get('security'); stream.security = urlParams.get('security');