Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-04-19 21:42:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "chore: add new grpc params for outbound (#2744)"

Browse source 
This reverts commit c49ec9a74c.
This commit is contained in:
Shishkevich D. 2025-03-09 05:37:50 +00:00
parent a16e83468b
commit a23a5de540
4 changed files with 14 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -420,17 +420,20 @@ class WsStreamSettings extends XrayCommonClass {
class GrpcStreamSettings extends XrayCommonClass { class GrpcStreamSettings extends XrayCommonClass {
constructor( constructor(
serviceName = "", serviceName = "",
authority = "" authority = "",
multiMode = false,
) { ) {
super(); super();
this.serviceName = serviceName; this.serviceName = serviceName;
this.authority = authority; this.authority = authority;
this.multiMode = multiMode;
} }
static fromJson(json = {}) { static fromJson(json = {}) {
return new GrpcStreamSettings( return new GrpcStreamSettings(
json.serviceName, json.serviceName,
json.authority, json.authority,
json.multiMode
); );
} }
@ -438,6 +441,7 @@ class GrpcStreamSettings extends XrayCommonClass {
return { return {
serviceName: this.serviceName, serviceName: this.serviceName,
authority: this.authority, authority: this.authority,
multiMode: this.multiMode,
} }
} }
} }

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

@ -251,47 +251,23 @@ class GrpcStreamSettings extends CommonClass {
constructor( constructor(
serviceName = "", serviceName = "",
authority = "", authority = "",
multiMode = false, multiMode = false
userAgent = "",
idleTimeout = 60,
healthCheckTimeout = 20,
permitWithoutStream = false,
initialWindowsSize = 0
) { ) {
super(); super();
this.serviceName = serviceName; this.serviceName = serviceName;
this.authority = authority; this.authority = authority;
this.multiMode = multiMode; this.multiMode = multiMode;
this.user_agent = userAgent;
this.idle_timeout = idleTimeout;
this.health_check_timeout = healthCheckTimeout;
this.permit_without_stream = permitWithoutStream;
this.initial_windows_size = initialWindowsSize;
} }
static fromJson(json = {}) { static fromJson(json = {}) {
return new GrpcStreamSettings( return new GrpcStreamSettings(json.serviceName, json.authority, json.multiMode);
json.serviceName,
json.authority,
json.multiMode,
json.user_agent,
json.idle_timeout,
json.health_check_timeout,
json.permit_without_stream,
json.initial_windows_size
);
} }
toJson() { toJson() {
return { return {
serviceName: this.serviceName, serviceName: this.serviceName,
authority: this.authority, authority: this.authority,
multiMode: this.multiMode, multiMode: this.multiMode
user_agent: this.user_agent,
idle_timeout: this.idle_timeout,
health_check_timeout: this.health_check_timeout,
permit_without_stream: this.permit_without_stream,
initial_windows_size: this.initial_windows_size
} }
} }
} }

15
web/html/xui/form/outbound.html
View file

@ -352,21 +352,6 @@
<a-form-item label='Multi Mode'> <a-form-item label='Multi Mode'>
<a-switch v-model="outbound.stream.grpc.multiMode"></a-switch> <a-switch v-model="outbound.stream.grpc.multiMode"></a-switch>
</a-form-item> </a-form-item>
<a-form-item label="User Agent">
<a-input v-model.trim="outbound.stream.grpc.user_agent"></a-input>
</a-form-item>
<a-form-item label="Idle Timeout">
<a-input-number v-model.number="outbound.stream.grpc.idle_timeout"></a-input-number>
</a-form-item>
<a-form-item label="Health Check Timeout">
<a-input-number v-model.number="outbound.stream.grpc.health_check_timeout"></a-input-number>
</a-form-item>
<a-form-item label="Permit Without Stream">
<a-switch v-model="outbound.stream.grpc.permit_without_stream"></a-switch>
</a-form-item>
<a-form-item label="Initial Window Size">
<a-input-number v-model.number="outbound.stream.grpc.initial_windows_size"></a-input-number>
</a-form-item>
</template> </template>
<!-- httpupgrade --> <!-- httpupgrade -->

9
web/html/xui/form/stream/stream_grpc.html
View file

@ -1,10 +1,13 @@
{{define "form/streamGRPC"}} {{define "form/streamGRPC"}}
<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }"> <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
<a-form-item label="Authority">
<a-input v-model.trim="inbound.stream.grpc.authority"></a-input>
</a-form-item>
<a-form-item label="Service Name"> <a-form-item label="Service Name">
<a-input v-model.trim="inbound.stream.grpc.serviceName"></a-input> <a-input v-model.trim="inbound.stream.grpc.serviceName"></a-input>
</a-form-item> </a-form-item>
<a-form-item label="Authority">
<a-input v-model.trim="inbound.stream.grpc.authority"></a-input>
</a-form-item>
<a-form-item label="Multi Mode">
<a-switch v-model="inbound.stream.grpc.multiMode"></a-switch>
</a-form-item>
</a-form> </a-form>
{{end}} {{end}}