mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-28 10:25:49 +00:00
kcp: noise, header-custom, sudoku
This commit is contained in:
MHSanaei
parent
0aca2d3b3d
commit
9791b05a4e
6 changed files with 174 additions and 74 deletions
|
|
@ -1085,11 +1085,23 @@ class UdpMask extends XrayCommonClass {
|
|||
case 'header-wireguard':
|
||||
return {};
|
||||
case 'header-custom':
|
||||
return { client: [], server: [] };
|
||||
return {
|
||||
client: Array.isArray(settings.client) ? settings.client : [],
|
||||
server: Array.isArray(settings.server) ? settings.server : [],
|
||||
};
|
||||
case 'noise':
|
||||
return { reset: 0, noise: [] };
|
||||
return {
|
||||
reset: settings.reset ?? 0,
|
||||
noise: Array.isArray(settings.noise) ? settings.noise : [],
|
||||
};
|
||||
case 'sudoku':
|
||||
return { ascii: '', customTable: '', customTables: [], paddingMin: 0, paddingMax: 0 };
|
||||
return {
|
||||
ascii: settings.ascii || '',
|
||||
customTable: settings.customTable || '',
|
||||
customTables: settings.customTables ?? [],
|
||||
paddingMin: settings.paddingMin ?? 0,
|
||||
paddingMax: settings.paddingMax ?? 0,
|
||||
};
|
||||
default:
|
||||
return settings;
|
||||
}
|
||||
|
|
@ -1103,9 +1115,30 @@ class UdpMask extends XrayCommonClass {
|
|||
}
|
||||
|
||||
toJson() {
|
||||
const cleanItem = item => {
|
||||
const out = { ...item };
|
||||
if (out.type === 'array') {
|
||||
delete out.packet;
|
||||
} else {
|
||||
out.rand = 0;
|
||||
}
|
||||
return out;
|
||||
};
|
||||
|
||||
let settings = this.settings;
|
||||
if (this.type === 'noise' && settings && Array.isArray(settings.noise)) {
|
||||
settings = { ...settings, noise: settings.noise.map(cleanItem) };
|
||||
} else if (this.type === 'header-custom' && settings) {
|
||||
settings = {
|
||||
...settings,
|
||||
client: Array.isArray(settings.client) ? settings.client.map(cleanItem) : settings.client,
|
||||
server: Array.isArray(settings.server) ? settings.server.map(cleanItem) : settings.server,
|
||||
};
|
||||
}
|
||||
|
||||
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
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -655,11 +655,23 @@ class UdpMask extends CommonClass {
|
|||
case 'header-wireguard':
|
||||
return {}; // No settings needed
|
||||
case 'header-custom':
|
||||
return { client: [], server: [] };
|
||||
return {
|
||||
client: Array.isArray(settings.client) ? settings.client : [],
|
||||
server: Array.isArray(settings.server) ? settings.server : [],
|
||||
};
|
||||
case 'noise':
|
||||
return { reset: 0, noise: [] };
|
||||
return {
|
||||
reset: settings.reset ?? 0,
|
||||
noise: Array.isArray(settings.noise) ? settings.noise : [],
|
||||
};
|
||||
case 'sudoku':
|
||||
return { ascii: '', customTable: '', customTables: [], paddingMin: 0, paddingMax: 0 };
|
||||
return {
|
||||
ascii: settings.ascii || '',
|
||||
customTable: settings.customTable || '',
|
||||
customTables: Array.isArray(settings.customTables) ? settings.customTables : [],
|
||||
paddingMin: settings.paddingMin ?? 0,
|
||||
paddingMax: settings.paddingMax ?? 0
|
||||
};
|
||||
default:
|
||||
return settings;
|
||||
}
|
||||
|
|
@ -673,9 +685,30 @@ class UdpMask extends CommonClass {
|
|||
}
|
||||
|
||||
toJson() {
|
||||
const cleanItem = item => {
|
||||
const out = { ...item };
|
||||
if (out.type === 'array') {
|
||||
delete out.packet;
|
||||
} else {
|
||||
out.rand = 0;
|
||||
}
|
||||
return out;
|
||||
};
|
||||
|
||||
let settings = this.settings;
|
||||
if (this.type === 'noise' && settings && Array.isArray(settings.noise)) {
|
||||
settings = { ...settings, noise: settings.noise.map(cleanItem) };
|
||||
} else if (this.type === 'header-custom' && settings) {
|
||||
settings = {
|
||||
...settings,
|
||||
client: Array.isArray(settings.client) ? settings.client.map(cleanItem) : settings.client,
|
||||
server: Array.isArray(settings.server) ? settings.server.map(cleanItem) : settings.server,
|
||||
};
|
||||
}
|
||||
|
||||
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
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -152,6 +152,12 @@ class RandomUtil {
|
|||
return Base64.alternativeEncode(String.fromCharCode(...array));
|
||||
}
|
||||
|
||||
static randomBase64(length = 16) {
|
||||
const array = new Uint8Array(length);
|
||||
window.crypto.getRandomValues(array);
|
||||
return Base64.alternativeEncode(String.fromCharCode(...array));
|
||||
}
|
||||
|
||||
static randomBase32String(length = 16) {
|
||||
const array = new Uint8Array(length);
|
||||
|
||||
|
|
|
|||
|
|
@ -972,22 +972,11 @@
|
|||
:style="{ color: 'rgb(255, 77, 79)', cursor: 'pointer' }"
|
||||
></a-icon>
|
||||
</a-divider>
|
||||
<a-form-item label="Rand">
|
||||
<a-input-number
|
||||
v-model.number="c.rand"
|
||||
:min="0"
|
||||
></a-input-number>
|
||||
</a-form-item>
|
||||
<a-form-item label="Rand Range">
|
||||
<a-input
|
||||
v-model.trim="c.randRange"
|
||||
placeholder="0-255"
|
||||
></a-input>
|
||||
</a-form-item>
|
||||
<a-form-item label="Type">
|
||||
<a-select
|
||||
v-model="c.type"
|
||||
:dropdown-class-name="themeSwitcher.currentTheme"
|
||||
@change="t => { if(t === 'array') c.packet = []; else c.packet = ''; }"
|
||||
>
|
||||
<a-select-option value="array">Array</a-select-option>
|
||||
<a-select-option value="str">String</a-select-option>
|
||||
|
|
@ -995,7 +984,21 @@
|
|||
<a-select-option value="base64">Base64</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
<a-form-item label="Packet">
|
||||
<template v-if="c.type === 'array'">
|
||||
<a-form-item label="Rand">
|
||||
<a-input-number
|
||||
v-model.number="c.rand"
|
||||
:min="0"
|
||||
></a-input-number>
|
||||
</a-form-item>
|
||||
<a-form-item label="Rand Range">
|
||||
<a-input
|
||||
v-model.trim="c.randRange"
|
||||
placeholder="0-255"
|
||||
></a-input>
|
||||
</a-form-item>
|
||||
</template>
|
||||
<a-form-item label="Packet" v-else>
|
||||
<a-input v-model.trim="c.packet" placeholder="binary data" />
|
||||
</a-form-item>
|
||||
</template>
|
||||
|
|
@ -1017,22 +1020,11 @@
|
|||
:style="{ color: 'rgb(255, 77, 79)', cursor: 'pointer' }"
|
||||
></a-icon>
|
||||
</a-divider>
|
||||
<a-form-item label="Rand">
|
||||
<a-input-number
|
||||
v-model.number="s.rand"
|
||||
:min="0"
|
||||
></a-input-number>
|
||||
</a-form-item>
|
||||
<a-form-item label="Rand Range">
|
||||
<a-input
|
||||
v-model.trim="s.randRange"
|
||||
placeholder="0-255"
|
||||
></a-input>
|
||||
</a-form-item>
|
||||
<a-form-item label="Type">
|
||||
<a-select
|
||||
v-model="s.type"
|
||||
:dropdown-class-name="themeSwitcher.currentTheme"
|
||||
@change="t => { if(t === 'array') s.packet = []; else s.packet = ''; }"
|
||||
>
|
||||
<a-select-option value="array">Array</a-select-option>
|
||||
<a-select-option value="str">String</a-select-option>
|
||||
|
|
@ -1040,7 +1032,21 @@
|
|||
<a-select-option value="base64">Base64</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
<a-form-item label="Packet">
|
||||
<template v-if="s.type === 'array'">
|
||||
<a-form-item label="Rand">
|
||||
<a-input-number
|
||||
v-model.number="s.rand"
|
||||
:min="0"
|
||||
></a-input-number>
|
||||
</a-form-item>
|
||||
<a-form-item label="Rand Range">
|
||||
<a-input
|
||||
v-model.trim="s.randRange"
|
||||
placeholder="0-255"
|
||||
></a-input>
|
||||
</a-form-item>
|
||||
</template>
|
||||
<a-form-item label="Packet" v-else>
|
||||
<a-input v-model.trim="s.packet" placeholder="binary data" />
|
||||
</a-form-item>
|
||||
</template>
|
||||
|
|
@ -1080,7 +1086,7 @@
|
|||
type="plus"
|
||||
type="primary"
|
||||
size="small"
|
||||
@click="mask.settings.noise.push({rand: '1-8192', randRange: '0-255', type: 'array', packet: '', delay: ''})"
|
||||
@click="mask.settings.noise.push({rand: 0, randRange: '0-255', type: 'array', packet: [], delay: ''})"
|
||||
/>
|
||||
</a-form-item>
|
||||
<template v-for="(n, index) in mask.settings.noise" :key="index">
|
||||
|
|
@ -1092,22 +1098,11 @@
|
|||
:style="{ color: 'rgb(255, 77, 79)', cursor: 'pointer' }"
|
||||
></a-icon>
|
||||
</a-divider>
|
||||
<a-form-item label="Rand">
|
||||
<a-input-number
|
||||
v-model.number="n.rand"
|
||||
:min="0"
|
||||
></a-input-number>
|
||||
</a-form-item>
|
||||
<a-form-item label="Rand Range">
|
||||
<a-input
|
||||
v-model.trim="n.randRange"
|
||||
placeholder="0-255"
|
||||
></a-input>
|
||||
</a-form-item>
|
||||
<a-form-item label="Type">
|
||||
<a-select
|
||||
v-model="n.type"
|
||||
:dropdown-class-name="themeSwitcher.currentTheme"
|
||||
@change="t => { if(t === 'array') n.packet = []; else n.packet = ''; }"
|
||||
>
|
||||
<a-select-option value="array">Array</a-select-option>
|
||||
<a-select-option value="str">String</a-select-option>
|
||||
|
|
@ -1115,7 +1110,18 @@
|
|||
<a-select-option value="base64">Base64</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
<a-form-item label="Packet">
|
||||
<template v-if="n.type === 'array'">
|
||||
<a-form-item label="Rand">
|
||||
<a-input v-model.trim="n.rand" placeholder="0 or 1-8192" />
|
||||
</a-form-item>
|
||||
<a-form-item label="Rand Range">
|
||||
<a-input
|
||||
v-model.trim="n.randRange"
|
||||
placeholder="0-255"
|
||||
></a-input>
|
||||
</a-form-item>
|
||||
</template>
|
||||
<a-form-item label="Packet" v-else>
|
||||
<a-input v-model.trim="n.packet" placeholder="binary data" />
|
||||
</a-form-item>
|
||||
<a-form-item label="Delay">
|
||||
|
|
|
|||
|
|
@ -116,16 +116,11 @@
|
|||
:style="{ color: 'rgb(255, 77, 79)', cursor: 'pointer' }"
|
||||
></a-icon>
|
||||
</a-divider>
|
||||
<a-form-item label="Rand">
|
||||
<a-input-number v-model.number="c.rand" />
|
||||
</a-form-item>
|
||||
<a-form-item label="Rand Range">
|
||||
<a-input v-model.trim="c.randRange" placeholder="0-255" />
|
||||
</a-form-item>
|
||||
<a-form-item label='{{ i18n "pages.xray.outbound.type" }}'>
|
||||
<a-select
|
||||
v-model="c.type"
|
||||
:dropdown-class-name="themeSwitcher.currentTheme"
|
||||
@change="t => { if(t === 'base64') c.packet = RandomUtil.randomBase64(); else if(t === 'array') c.packet = []; else c.packet = ''; }"
|
||||
>
|
||||
<a-select-option value="array">Array</a-select-option>
|
||||
<a-select-option value="str">String</a-select-option>
|
||||
|
|
@ -133,8 +128,20 @@
|
|||
<a-select-option value="base64">Base64</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
<a-form-item label="Packet">
|
||||
<a-input v-model.trim="c.packet" placeholder="binary data" />
|
||||
<template v-if="c.type === 'array'">
|
||||
<a-form-item label="Rand">
|
||||
<a-input-number v-model.number="c.rand" />
|
||||
</a-form-item>
|
||||
<a-form-item label="Rand Range">
|
||||
<a-input v-model.trim="c.randRange" placeholder="0-255" />
|
||||
</a-form-item>
|
||||
</template>
|
||||
<a-form-item v-else label="Packet">
|
||||
<a-input-group compact v-if="c.type === 'base64'">
|
||||
<a-input v-model.trim="c.packet" placeholder="binary data" :style="{ width: 'calc(100% - 32px)' }" />
|
||||
<a-button icon="reload" @click="c.packet = RandomUtil.randomBase64()" />
|
||||
</a-input-group>
|
||||
<a-input v-else v-model.trim="c.packet" placeholder="binary data" />
|
||||
</a-form-item>
|
||||
</template>
|
||||
<a-divider :style="{ margin: '0' }"></a-divider>
|
||||
|
|
@ -155,16 +162,11 @@
|
|||
:style="{ color: 'rgb(255, 77, 79)', cursor: 'pointer' }"
|
||||
></a-icon>
|
||||
</a-divider>
|
||||
<a-form-item label="Rand">
|
||||
<a-input-number v-model.number="s.rand" />
|
||||
</a-form-item>
|
||||
<a-form-item label="Rand Range">
|
||||
<a-input v-model.trim="s.randRange" placeholder="0-255" />
|
||||
</a-form-item>
|
||||
<a-form-item label='{{ i18n "pages.xray.outbound.type" }}'>
|
||||
<a-select
|
||||
v-model="s.type"
|
||||
:dropdown-class-name="themeSwitcher.currentTheme"
|
||||
@change="t => { if(t === 'base64') s.packet = RandomUtil.randomBase64(); else if(t === 'array') s.packet = []; else s.packet = ''; }"
|
||||
>
|
||||
<a-select-option value="array">Array</a-select-option>
|
||||
<a-select-option value="str">String</a-select-option>
|
||||
|
|
@ -172,8 +174,20 @@
|
|||
<a-select-option value="base64">Base64</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
<a-form-item label="Packet">
|
||||
<a-input v-model.trim="s.packet" placeholder="binary data" />
|
||||
<template v-if="s.type === 'array'">
|
||||
<a-form-item label="Rand">
|
||||
<a-input-number v-model.number="s.rand" />
|
||||
</a-form-item>
|
||||
<a-form-item label="Rand Range">
|
||||
<a-input v-model.trim="s.randRange" placeholder="0-255" />
|
||||
</a-form-item>
|
||||
</template>
|
||||
<a-form-item v-else label="Packet">
|
||||
<a-input-group compact v-if="s.type === 'base64'">
|
||||
<a-input v-model.trim="s.packet" placeholder="binary data" :style="{ width: 'calc(100% - 32px)' }" />
|
||||
<a-button icon="reload" @click="s.packet = RandomUtil.randomBase64()" />
|
||||
</a-input-group>
|
||||
<a-input v-else v-model.trim="s.packet" placeholder="binary data" />
|
||||
</a-form-item>
|
||||
</template>
|
||||
</template>
|
||||
|
|
@ -186,7 +200,7 @@
|
|||
type="plus"
|
||||
type="primary"
|
||||
size="small"
|
||||
@click="mask.settings.noise.push({rand: '1-8192', randRange: '0-255', type: 'array', packet: '', delay: ''})"
|
||||
@click="mask.settings.noise.push({rand: '1-8192', randRange: '0-255', type: 'array', packet: [], delay: '10-20'})"
|
||||
/>
|
||||
</a-form-item>
|
||||
<template v-for="(n, index) in mask.settings.noise" :key="index">
|
||||
|
|
@ -198,16 +212,11 @@
|
|||
:style="{ color: 'rgb(255, 77, 79)', cursor: 'pointer' }"
|
||||
></a-icon>
|
||||
</a-divider>
|
||||
<a-form-item label="Rand">
|
||||
<a-input v-model.trim="n.rand" placeholder="1-8192" />
|
||||
</a-form-item>
|
||||
<a-form-item label="Rand Range">
|
||||
<a-input v-model.trim="n.randRange" placeholder="0-255" />
|
||||
</a-form-item>
|
||||
<a-form-item label='{{ i18n "pages.xray.outbound.type" }}'>
|
||||
<a-select
|
||||
v-model="n.type"
|
||||
:dropdown-class-name="themeSwitcher.currentTheme"
|
||||
@change="t => { if(t === 'base64') n.packet = RandomUtil.randomBase64(); else if(t === 'array') n.packet = []; else n.packet = ''; }"
|
||||
>
|
||||
<a-select-option value="array">Array</a-select-option>
|
||||
<a-select-option value="str">String</a-select-option>
|
||||
|
|
@ -215,8 +224,20 @@
|
|||
<a-select-option value="base64">Base64</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
<a-form-item label="Packet">
|
||||
<a-input v-model.trim="n.packet" placeholder="binary data" />
|
||||
<template v-if="n.type === 'array'">
|
||||
<a-form-item label="Rand">
|
||||
<a-input v-model.trim="n.rand" placeholder="0 or 1-8192" />
|
||||
</a-form-item>
|
||||
<a-form-item label="Rand Range">
|
||||
<a-input v-model.trim="n.randRange" placeholder="0-255" />
|
||||
</a-form-item>
|
||||
</template>
|
||||
<a-form-item v-else label="Packet">
|
||||
<a-input-group compact v-if="n.type === 'base64'">
|
||||
<a-input v-model.trim="n.packet" placeholder="binary data" :style="{ width: 'calc(100% - 32px)' }" />
|
||||
<a-button icon="reload" @click="n.packet = RandomUtil.randomBase64()" />
|
||||
</a-input-group>
|
||||
<a-input v-else v-model.trim="n.packet" placeholder="binary data" />
|
||||
</a-form-item>
|
||||
<a-form-item label="Delay">
|
||||
<a-input v-model.trim="n.delay" placeholder="10-20" />
|
||||
|
|
|
|||
|
|
@ -1077,7 +1077,8 @@
|
|||
return;
|
||||
}
|
||||
if (!msg.obj) return;
|
||||
const { geoip = [], geosite = [] } = msg.obj;
|
||||
const geoip = msg.obj.geoip ?? [];
|
||||
const geosite = msg.obj.geosite ?? [];
|
||||
const geoSuffix = this.customGeoAliasLabelSuffix || '';
|
||||
geoip.forEach((x) => {
|
||||
this.settingsData.IPsOptions.push({
|
||||
|
|
|
|||
Loading…
Reference in a new issue