Murzaby/x-ui
1
0
Fork 0
mirror of https://github.com/alireza0/x-ui.git synced 2026-10-21 11:11:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finalmask: build valid Header Custom items (one kind per item, real byte arrays)

Browse source
This commit is contained in:
Alireza Ahmadi 2026-10-09 23:51:39 +02:00
parent 571afa0d3e
commit 2f77f36551
2 changed files with 94 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

48
web/assets/js/model/inbound.js
View file

@ -1411,6 +1411,35 @@ class UdpMask extends XrayCommonClass {
.filter(d => d && d.name !== undefined);
}
// A Header Custom item is exactly one of: a fixed "packet", "rand" random
// bytes, a "reuse"d capture or a "transform". The form keeps an empty packet
// and a rand on every item, which the core refuses together, and an "array"
// packet typed as "1,2,3" must become a real JSON array.
static customItemToJson(item = {}) {
const out = {};
for (const key of ['capture', 'reuse', 'transform']) {
if (item[key]) out[key] = item[key];
}
const packet = item.packet ?? '';
const hasPacket = Array.isArray(packet) ? packet.length > 0 : String(packet) !== '';
if (out.reuse || out.transform) {
// the item's kind is already set
} else if (hasPacket) {
if (!item.type || item.type === 'array') {
out.packet = Array.isArray(packet) ? packet
: String(packet).split(/[\s,]+/).filter(Boolean).map(Number);
} else {
out.type = item.type;
out.packet = packet;
}
} else if (Number(item.rand) > 0) {
out.rand = Number(item.rand);
if (item.randRange) out.randRange = item.randRange;
}
if (item.delay) out.delay = item.delay;
return out;
}
// Xray-core takes either random bytes ("rand") or a fixed "packet" per noise
// item, never both, and an "array" packet must be a real JSON array. "exp"
// builds the packet from tags such as <b 0d0a><t><rc 20-40>.
@ -1450,6 +1479,13 @@ class UdpMask extends XrayCommonClass {
toJson() {
let settings = this.settings;
if (this.type === 'header-custom') {
settings = {
...settings,
client: (settings.client || []).map(i => UdpMask.customItemToJson(i)),
server: (settings.server || []).map(i => UdpMask.customItemToJson(i)),
};
}
if (this.type === 'noise') {
settings = { reset: settings.reset || undefined, noise: (settings.noise || []).map(n => UdpMask.noiseItemToJson(n)) };
}
@ -1509,9 +1545,19 @@ class TcpMask extends XrayCommonClass {
}
toJson() {
let settings = this.settings;
if (this.type === 'header-custom') {
const rounds = list => (list || []).map(round => (round || []).map(i => UdpMask.customItemToJson(i)));
settings = {
...settings,
clients: rounds(settings.clients),
servers: rounds(settings.servers),
errors: rounds(settings.errors),
};
}
return {
type: this.type,
settings: (this.settings && Object.keys(this.settings).length > 0) ? this.settings : undefined
settings: (settings && Object.keys(settings).length > 0) ? settings : undefined
};
}
}

48
web/assets/js/model/outbound.js
View file

@ -925,6 +925,35 @@ class UdpMask extends CommonClass {
return { domains, resolvers, extraPoll: settings.extraPoll ?? 0 };
}
// A Header Custom item is exactly one of: a fixed "packet", "rand" random
// bytes, a "reuse"d capture or a "transform". The form keeps an empty packet
// and a rand on every item, which the core refuses together, and an "array"
// packet typed as "1,2,3" must become a real JSON array.
static customItemToJson(item = {}) {
const out = {};
for (const key of ['capture', 'reuse', 'transform']) {
if (item[key]) out[key] = item[key];
}
const packet = item.packet ?? '';
const hasPacket = Array.isArray(packet) ? packet.length > 0 : String(packet) !== '';
if (out.reuse || out.transform) {
// the item's kind is already set
} else if (hasPacket) {
if (!item.type || item.type === 'array') {
out.packet = Array.isArray(packet) ? packet
: String(packet).split(/[\s,]+/).filter(Boolean).map(Number);
} else {
out.type = item.type;
out.packet = packet;
}
} else if (Number(item.rand) > 0) {
out.rand = Number(item.rand);
if (item.randRange) out.randRange = item.randRange;
}
if (item.delay) out.delay = item.delay;
return out;
}
// Xray-core takes either random bytes ("rand") or a fixed "packet" per noise
// item, never both, and an "array" packet must be a real JSON array. "exp"
// builds the packet from tags such as <b 0d0a><t><rc 20-40>.
@ -964,6 +993,13 @@ class UdpMask extends CommonClass {
toJson() {
let settings = this.settings;
if (this.type === 'header-custom') {
settings = {
...settings,
client: (settings.client || []).map(i => UdpMask.customItemToJson(i)),
server: (settings.server || []).map(i => UdpMask.customItemToJson(i)),
};
}
if (this.type === 'noise') {
settings = { ...settings, noise: (settings.noise || []).map(n => UdpMask.noiseItemToJson(n)) };
if (!settings.reset) delete settings.reset;
@ -1025,9 +1061,19 @@ class TcpMask extends CommonClass {
}
toJson() {
let settings = this.settings;
if (this.type === 'header-custom') {
const rounds = list => (list || []).map(round => (round || []).map(i => UdpMask.customItemToJson(i)));
settings = {
...settings,
clients: rounds(settings.clients),
servers: rounds(settings.servers),
errors: rounds(settings.errors),
};
}
return {
type: this.type,
settings: CommonClass.shrinkObject(this.settings)
settings: CommonClass.shrinkObject(settings)
};
}
}