Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-10-30 20:02:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MHSanaei:main' into main

Browse source
This commit is contained in:
serogaq 2024-12-13 02:05:17 +03:00 committed by GitHub
commit 978b5af865
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -507,6 +507,7 @@ class xHTTPStreamSettings extends XrayCommonClass {
}, },
mode = MODE_OPTION.AUTO, mode = MODE_OPTION.AUTO,
noGRPCHeader = false, noGRPCHeader = false,
keepAlivePeriod = 45,
) { ) {
super(); super();
this.path = path; this.path = path;
@ -520,6 +521,7 @@ class xHTTPStreamSettings extends XrayCommonClass {
this.xmux = xmux; this.xmux = xmux;
this.mode = mode; this.mode = mode;
this.noGRPCHeader = noGRPCHeader; this.noGRPCHeader = noGRPCHeader;
this.keepAlivePeriod = keepAlivePeriod;
} }
addHeader(name, value) { addHeader(name, value) {
@ -542,7 +544,8 @@ class xHTTPStreamSettings extends XrayCommonClass {
json.xPaddingBytes, json.xPaddingBytes,
json.xmux, json.xmux,
json.mode, json.mode,
json.noGRPCHeader json.noGRPCHeader,
json.keepAlivePeriod,
); );
} }
@ -563,7 +566,8 @@ class xHTTPStreamSettings extends XrayCommonClass {
cMaxLifetimeMs: this.xmux.cMaxLifetimeMs cMaxLifetimeMs: this.xmux.cMaxLifetimeMs
}, },
mode: this.mode, mode: this.mode,
noGRPCHeader: this.noGRPCHeader noGRPCHeader: this.noGRPCHeader,
keepAlivePeriod: this.keepAlivePeriod,
}; };
} }
} }

2
web/html/xui/form/stream/stream_ws.html
View file

@ -13,7 +13,7 @@
<a-input-number v-model.number="inbound.stream.ws.heartbeatPeriod" :min="0"></a-input-number> <a-input-number v-model.number="inbound.stream.ws.heartbeatPeriod" :min="0"></a-input-number>
</a-form-item> </a-form-item>
<a-form-item label='{{ i18n "pages.inbounds.stream.tcp.requestHeader" }}'> <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.requestHeader" }}'>
<a-button icon="plus" size="small" @click="inbound.stream.ws.addHeader('host', '')"></a-button> <a-button icon="plus" size="small" @click="inbound.stream.ws.addHeader('', '')"></a-button>
</a-form-item> </a-form-item>
<a-form-item :wrapper-col="{span:24}"> <a-form-item :wrapper-col="{span:24}">
<a-input-group compact v-for="(header, index) in inbound.stream.ws.headers"> <a-input-group compact v-for="(header, index) in inbound.stream.ws.headers">

6
web/html/xui/form/stream/stream_xhttp.html
View file

@ -17,8 +17,7 @@
</a-input> </a-input>
<a-input style="width: 50%" v-model.trim="header.value" <a-input style="width: 50%" v-model.trim="header.value"
placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'> placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
<a-button slot="addonAfter" size="small" <a-button slot="addonAfter" size="small" @click="inbound.stream.xhttp.removeHeader(index)">-</a-button>
@click="inbound.stream.xhttp.removeHeader(index)">-</a-button>
</a-input> </a-input>
</a-input-group> </a-input-group>
</a-form-item> </a-form-item>
@ -28,6 +27,9 @@
<a-select-option v-for="key in MODE_OPTION" :value="key">[[ key ]]</a-select-option> <a-select-option v-for="key in MODE_OPTION" :value="key">[[ key ]]</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item label='keep-Alive Period'>
<a-input-number v-model.number="inbound.stream.xhttp.keepAlivePeriod"></a-input-number>
</a-form-item>
<a-form-item label="Max Concurrent Upload"> <a-form-item label="Max Concurrent Upload">
<a-input v-model.trim="inbound.stream.xhttp.scMaxConcurrentPosts"></a-input> <a-input v-model.trim="inbound.stream.xhttp.scMaxConcurrentPosts"></a-input>
</a-form-item> </a-form-item>