mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-17 18:45:03 +03:00
fea3c94b11
* feat(xhttp): support sessionID* rename + sessionIDTable/Length (xray v26.6.22) xray-core v26.6.22 (PR #6258) renamed the XHTTP session config keys sessionPlacement/sessionKey to sessionIDPlacement/sessionIDKey (no fallback kept in core) and added sessionIDTable (predefined charset name or literal ASCII) and sessionIDLength (range, e.g. 16-32, lower bound > 0). Panel changes: - Schema (xhttp.ts): rename the two keys, add sessionIDTable/sessionIDLength, and a z.preprocess that lifts legacy keys off stored configs so an upgraded panel never silently drops a saved session setting. - Wire normalize + share-link build/parse: rename keys, emit the two new fields, and accept legacy sessionPlacement/sessionKey from old share links. - Inbound + outbound XHTTP forms: rename field paths, add a sessionIDTable autocomplete (9 predefined tables + free ASCII) and a sessionIDLength range input shown only when a table is set, with light client validation (ASCII table, length min > 0; xray enforces the room-size minimum server-side). - Subscription (service.go) and Clash (clash_service.go) builders: emit the renamed + new keys, with a legacy fallback for not-yet-resaved inbounds. - Locales: add sessionIDTable/sessionIDLength labels + hints in all 13 files. Two sibling v26.6.22 XHTTP commits need no panel change and are covered by the core bump alone: #6332 (XHTTP/3 closes QUIC/UDP) and #6320 (udpHop honors the existing dialerProxy). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * test(xhttp): add Session ID Table to inbound form-blocks snapshot The new sessionIDTable input renders by default in the inbound XHTTP form, so its label joins the field-structure snapshot. sessionIDLength stays conditional (only shown when a table is set), so it does not appear here. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(xhttp): migrate legacy session keys in the running xray config The Zod preprocess plus the subscription/Clash fallbacks only covered the panel UI and share-link output. The config handed to the running xray-core process is built from the raw stored streamSettings in GetXrayConfig, which did not rewrite the renamed XHTTP session keys — so a pre-upgrade inbound (or template outbound) stored with a non-default sessionPlacement was emitted unchanged and dropped by xray-core v26.6.22, until the admin re-saved it. Lift sessionPlacement/sessionKey onto sessionIDPlacement/sessionIDKey at config-generation time, in the existing inbound stream-rewrite block (next to the tls/reality/externalProxy handling) and across template outbounds. The lift is idempotent and leaves unchanged configs byte-identical so the hot-reload diff never sees a spurious change. Also tighten validateSessionIDLength to reject an inverted range (e.g. 32-16) in addition to the existing lower-bound > 0 check. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(xray): avoid summed-capacity allocation in mergeSubscriptionOutbounds CodeQL go/allocation-size-overflow flagged the pre-sized make() whose capacity was a sum of three slice lengths. Grow the slice via append on a nil slice instead; same result, no overflow-prone capacity expression.
328 lines
12 KiB
TypeScript
328 lines
12 KiB
TypeScript
import { useTranslation } from 'react-i18next';
|
|
import { AutoComplete, Form, Input, InputNumber, Select, Switch, type FormInstance } from 'antd';
|
|
|
|
import { HeaderMapEditor } from '@/components/form';
|
|
import type { InboundFormValues } from '@/schemas/forms/inbound-form';
|
|
import { XHTTP_SESSION_ID_TABLES, XHttpXmuxSchema } from '@/schemas/protocols/stream/xhttp';
|
|
import { validateSessionIDLength, validateSessionIDTable } from '@/lib/xray/xhttp-session-id';
|
|
|
|
const XMUX_DEFAULTS = XHttpXmuxSchema.parse({});
|
|
|
|
export default function XhttpForm({ form }: { form: FormInstance<InboundFormValues> }) {
|
|
const { t } = useTranslation();
|
|
const xhttpMode = Form.useWatch(['streamSettings', 'xhttpSettings', 'mode'], form);
|
|
const xhttpObfsMode = Form.useWatch(['streamSettings', 'xhttpSettings', 'xPaddingObfsMode'], form) ?? false;
|
|
const xhttpSessionIDPlacement = Form.useWatch(['streamSettings', 'xhttpSettings', 'sessionIDPlacement'], form);
|
|
const xhttpSessionIDTable = Form.useWatch(['streamSettings', 'xhttpSettings', 'sessionIDTable'], form);
|
|
const xhttpSeqPlacement = Form.useWatch(['streamSettings', 'xhttpSettings', 'seqPlacement'], form);
|
|
const xhttpUplinkPlacement = Form.useWatch(['streamSettings', 'xhttpSettings', 'uplinkDataPlacement'], form);
|
|
|
|
function onXmuxToggle(checked: boolean) {
|
|
if (!checked) return;
|
|
const existing = form.getFieldValue(['streamSettings', 'xhttpSettings', 'xmux']);
|
|
const hasValues = existing && typeof existing === 'object' && Object.keys(existing).length > 0;
|
|
if (hasValues) return;
|
|
form.setFieldValue(['streamSettings', 'xhttpSettings', 'xmux'], { ...XMUX_DEFAULTS });
|
|
}
|
|
|
|
return (
|
|
<>
|
|
<Form.Item name={['streamSettings', 'xhttpSettings', 'host']} label={t('host')}>
|
|
<Input />
|
|
</Form.Item>
|
|
<Form.Item name={['streamSettings', 'xhttpSettings', 'path']} label={t('path')}>
|
|
<Input />
|
|
</Form.Item>
|
|
<Form.Item name={['streamSettings', 'xhttpSettings', 'mode']} label={t('pages.inbounds.info.mode')}>
|
|
<Select
|
|
style={{ width: '50%' }}
|
|
options={(['auto', 'packet-up', 'stream-up', 'stream-one'] as const).map((m) => ({
|
|
value: m,
|
|
label: m,
|
|
}))}
|
|
/>
|
|
</Form.Item>
|
|
{(xhttpMode === 'packet-up' || xhttpMode === 'auto') && (
|
|
<>
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'scMaxEachPostBytes']}
|
|
label={t('pages.inbounds.form.maxUploadSize')}
|
|
>
|
|
<Input />
|
|
</Form.Item>
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'scMaxBufferedPosts']}
|
|
label={t('pages.inbounds.form.maxBufferedUpload')}
|
|
>
|
|
<InputNumber />
|
|
</Form.Item>
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'scMinPostsIntervalMs']}
|
|
label={t('pages.xray.outboundForm.minUploadInterval')}
|
|
>
|
|
<Input placeholder="e.g. 50-150" />
|
|
</Form.Item>
|
|
</>
|
|
)}
|
|
{xhttpMode === 'stream-up' && (
|
|
<>
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'scMaxBufferedPosts']}
|
|
label={t('pages.inbounds.form.maxBufferedUpload')}
|
|
>
|
|
<InputNumber />
|
|
</Form.Item>
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'scStreamUpServerSecs']}
|
|
label={t('pages.inbounds.form.streamUpServer')}
|
|
>
|
|
<Input />
|
|
</Form.Item>
|
|
</>
|
|
)}
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'serverMaxHeaderBytes']}
|
|
label={t('pages.inbounds.form.serverMaxHeaderBytes')}
|
|
>
|
|
<InputNumber min={0} placeholder="0 (default)" />
|
|
</Form.Item>
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'xPaddingBytes']}
|
|
label={t('pages.inbounds.form.paddingBytes')}
|
|
>
|
|
<Input />
|
|
</Form.Item>
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'headers']}
|
|
label={t('pages.inbounds.form.headers')}
|
|
>
|
|
<HeaderMapEditor mode="v1" />
|
|
</Form.Item>
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'uplinkHTTPMethod']}
|
|
label={t('pages.inbounds.form.uplinkHttpMethod')}
|
|
>
|
|
<Select
|
|
options={[
|
|
{ value: '', label: 'Default (POST)' },
|
|
{ value: 'POST', label: 'POST' },
|
|
{ value: 'PUT', label: 'PUT' },
|
|
{
|
|
value: 'GET',
|
|
label: 'GET (packet-up only)',
|
|
disabled: xhttpMode !== 'packet-up',
|
|
},
|
|
]}
|
|
/>
|
|
</Form.Item>
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'xPaddingObfsMode']}
|
|
label={t('pages.inbounds.form.paddingObfsMode')}
|
|
valuePropName="checked"
|
|
>
|
|
<Switch />
|
|
</Form.Item>
|
|
{xhttpObfsMode && (
|
|
<>
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'xPaddingKey']}
|
|
label={t('pages.inbounds.form.paddingKey')}
|
|
>
|
|
<Input placeholder="x_padding" />
|
|
</Form.Item>
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'xPaddingHeader']}
|
|
label={t('pages.inbounds.form.paddingHeader')}
|
|
>
|
|
<Input placeholder="X-Padding" />
|
|
</Form.Item>
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'xPaddingPlacement']}
|
|
label={t('pages.inbounds.form.paddingPlacement')}
|
|
>
|
|
<Select
|
|
options={[
|
|
{ value: '', label: 'Default (queryInHeader)' },
|
|
{ value: 'queryInHeader', label: 'queryInHeader' },
|
|
{ value: 'header', label: 'header' },
|
|
{ value: 'cookie', label: 'cookie' },
|
|
{ value: 'query', label: 'query' },
|
|
]}
|
|
/>
|
|
</Form.Item>
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'xPaddingMethod']}
|
|
label={t('pages.inbounds.form.paddingMethod')}
|
|
>
|
|
<Select
|
|
options={[
|
|
{ value: '', label: 'Default (repeat-x)' },
|
|
{ value: 'repeat-x', label: 'repeat-x' },
|
|
{ value: 'tokenish', label: 'tokenish' },
|
|
]}
|
|
/>
|
|
</Form.Item>
|
|
</>
|
|
)}
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'sessionIDPlacement']}
|
|
label={t('pages.inbounds.form.sessionPlacement')}
|
|
>
|
|
<Select
|
|
options={[
|
|
{ value: '', label: 'Default (path)' },
|
|
{ value: 'path', label: 'path' },
|
|
{ value: 'header', label: 'header' },
|
|
{ value: 'cookie', label: 'cookie' },
|
|
{ value: 'query', label: 'query' },
|
|
]}
|
|
/>
|
|
</Form.Item>
|
|
{xhttpSessionIDPlacement && xhttpSessionIDPlacement !== 'path' && (
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'sessionIDKey']}
|
|
label={t('pages.inbounds.form.sessionKey')}
|
|
>
|
|
<Input placeholder="x_session" />
|
|
</Form.Item>
|
|
)}
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'sessionIDTable']}
|
|
label={t('pages.inbounds.form.sessionIDTable')}
|
|
tooltip={t('pages.inbounds.form.sessionIDTableHint')}
|
|
rules={[{ validator: validateSessionIDTable }]}
|
|
>
|
|
<AutoComplete
|
|
allowClear
|
|
options={XHTTP_SESSION_ID_TABLES.map((v) => ({ value: v }))}
|
|
placeholder="Base62"
|
|
/>
|
|
</Form.Item>
|
|
{xhttpSessionIDTable && (
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'sessionIDLength']}
|
|
label={t('pages.inbounds.form.sessionIDLength')}
|
|
tooltip={t('pages.inbounds.form.sessionIDLengthHint')}
|
|
rules={[{ validator: validateSessionIDLength }]}
|
|
>
|
|
<Input placeholder="8-16" />
|
|
</Form.Item>
|
|
)}
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'seqPlacement']}
|
|
label={t('pages.inbounds.form.sequencePlacement')}
|
|
>
|
|
<Select
|
|
options={[
|
|
{ value: '', label: 'Default (path)' },
|
|
{ value: 'path', label: 'path' },
|
|
{ value: 'header', label: 'header' },
|
|
{ value: 'cookie', label: 'cookie' },
|
|
{ value: 'query', label: 'query' },
|
|
]}
|
|
/>
|
|
</Form.Item>
|
|
{xhttpSeqPlacement && xhttpSeqPlacement !== 'path' && (
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'seqKey']}
|
|
label={t('pages.inbounds.form.sequenceKey')}
|
|
>
|
|
<Input placeholder="x_seq" />
|
|
</Form.Item>
|
|
)}
|
|
{xhttpMode === 'packet-up' && (
|
|
<>
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'uplinkDataPlacement']}
|
|
label={t('pages.inbounds.form.uplinkDataPlacement')}
|
|
>
|
|
<Select
|
|
options={[
|
|
{ value: '', label: 'Default (body)' },
|
|
{ value: 'body', label: 'body' },
|
|
{ value: 'header', label: 'header' },
|
|
{ value: 'cookie', label: 'cookie' },
|
|
{ value: 'query', label: 'query' },
|
|
]}
|
|
/>
|
|
</Form.Item>
|
|
{xhttpUplinkPlacement && xhttpUplinkPlacement !== 'body' && (
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'uplinkDataKey']}
|
|
label={t('pages.inbounds.form.uplinkDataKey')}
|
|
>
|
|
<Input placeholder="x_data" />
|
|
</Form.Item>
|
|
)}
|
|
</>
|
|
)}
|
|
<Form.Item
|
|
name={['streamSettings', 'xhttpSettings', 'noSSEHeader']}
|
|
label={t('pages.inbounds.form.noSseHeader')}
|
|
valuePropName="checked"
|
|
>
|
|
<Switch />
|
|
</Form.Item>
|
|
{/* XMUX is the connection-multiplexing layer
|
|
xHTTP uses to fan out parallel requests over
|
|
a small pool of upstream connections. UI-only
|
|
toggle (enableXmux) hides the 6 nested knobs
|
|
when off. */}
|
|
<Form.Item
|
|
label="XMUX"
|
|
name={['streamSettings', 'xhttpSettings', 'enableXmux']}
|
|
valuePropName="checked"
|
|
>
|
|
<Switch onChange={onXmuxToggle} />
|
|
</Form.Item>
|
|
<Form.Item shouldUpdate noStyle>
|
|
{() => {
|
|
if (!form.getFieldValue([
|
|
'streamSettings', 'xhttpSettings', 'enableXmux',
|
|
])) return null;
|
|
return (
|
|
<>
|
|
<Form.Item
|
|
label={t('pages.xray.outboundForm.maxConcurrency')}
|
|
name={['streamSettings', 'xhttpSettings', 'xmux', 'maxConcurrency']}
|
|
>
|
|
<Input placeholder="16-32" />
|
|
</Form.Item>
|
|
<Form.Item
|
|
label={t('pages.xray.outboundForm.maxConnections')}
|
|
name={['streamSettings', 'xhttpSettings', 'xmux', 'maxConnections']}
|
|
>
|
|
<Input placeholder="0" />
|
|
</Form.Item>
|
|
<Form.Item
|
|
label={t('pages.xray.outboundForm.maxReuseTimes')}
|
|
name={['streamSettings', 'xhttpSettings', 'xmux', 'cMaxReuseTimes']}
|
|
>
|
|
<Input />
|
|
</Form.Item>
|
|
<Form.Item
|
|
label={t('pages.xray.outboundForm.maxRequestTimes')}
|
|
name={['streamSettings', 'xhttpSettings', 'xmux', 'hMaxRequestTimes']}
|
|
>
|
|
<Input placeholder="600-900" />
|
|
</Form.Item>
|
|
<Form.Item
|
|
label={t('pages.xray.outboundForm.maxReusableSecs')}
|
|
name={['streamSettings', 'xhttpSettings', 'xmux', 'hMaxReusableSecs']}
|
|
>
|
|
<Input placeholder="1800-3000" />
|
|
</Form.Item>
|
|
<Form.Item
|
|
label={t('pages.xray.outboundForm.keepAlivePeriod')}
|
|
name={['streamSettings', 'xhttpSettings', 'xmux', 'hKeepAlivePeriod']}
|
|
>
|
|
<InputNumber min={0} style={{ width: '100%' }} />
|
|
</Form.Item>
|
|
</>
|
|
);
|
|
}}
|
|
</Form.Item>
|
|
</>
|
|
);
|
|
}
|