better view for http header

MHSanaei · Jan 11, 2024 · 594f004 · 594f004
1 parent bee6904
commit 594f004
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 71 deletions.
diff --git a/web/html/xui/form/stream/stream_tcp.html b/web/html/xui/form/stream/stream_tcp.html
@@ -5,54 +5,59 @@
         <a-switch v-model="inbound.stream.tcp.acceptProxyProtocol"></a-switch>
     </a-form-item>
     <a-form-item label='HTTP {{ i18n "camouflage" }}'>
-        <a-switch
-            :checked="inbound.stream.tcp.type === 'http'"
+        <a-switch :checked="inbound.stream.tcp.type === 'http'"
             @change="checked => inbound.stream.tcp.type = checked ? 'http' : 'none'">
         </a-switch>
     </a-form-item>
 </a-form>
 
-<!-- tcp request -->
-<a-form v-if="inbound.stream.tcp.type === 'http'" :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.requestVersion" }}'>
+<a-form v-if="inbound.stream.tcp.type === 'http'" :colon="false" :label-col="{ md: {span:8} }"
+    :wrapper-col="{ md: {span:14} }">
+    <!-- tcp request -->
+    <a-divider style="margin:0;">{{ i18n "pages.inbounds.stream.general.request" }}</a-divider>
+    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.version" }}'>
         <a-input v-model.trim="inbound.stream.tcp.request.version"></a-input>
     </a-form-item>
-    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.requestMethod" }}'>
-                    <a-input v-model.trim="inbound.stream.tcp.request.method"></a-input>
+    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.method" }}'>
+        <a-input v-model.trim="inbound.stream.tcp.request.method"></a-input>
     </a-form-item>
     <a-form-item>
-        <template slot="label">{{ i18n "pages.inbounds.stream.tcp.requestPath" }}
+        <template slot="label">{{ i18n "pages.inbounds.stream.tcp.path" }}
             <a-button size="small" @click="inbound.stream.tcp.request.addPath('/')">+</a-button>
         </template>
         <template v-for="(path, index) in inbound.stream.tcp.request.path">
             <a-input v-model.trim="inbound.stream.tcp.request.path[index]">
-                <a-button size="small" slot="addonAfter"
-                @click="inbound.stream.tcp.request.removePath(index)"
-                v-if="inbound.stream.tcp.request.path.length>1">-</a-button>
+                <a-button size="small" slot="addonAfter" @click="inbound.stream.tcp.request.removePath(index)"
+                    v-if="inbound.stream.tcp.request.path.length>1">-</a-button>
             </a-input>
         </template>
-    </a-form-item> 
-    <a-form-item label='{{ i18n "pages.inbounds.stream.general.requestHeader" }}'>
+    </a-form-item>
+    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.requestHeader" }}'>
         <a-button size="small" @click="inbound.stream.tcp.request.addHeader('host', '')">+</a-button>
     </a-form-item>
     <a-form-item :wrapper-col="{span:24}">
         <a-input-group compact v-for="(header, index) in inbound.stream.tcp.request.headers">
-            <a-input style="width: 50%" v-model.trim="header.name" placeholder='{{ i18n "pages.inbounds.stream.general.name" }}'>
+            <a-input style="width: 50%" v-model.trim="header.name"
+                placeholder='{{ i18n "pages.inbounds.stream.general.name" }}'>
                 <template slot="addonBefore" style="margin: 0;">[[ index+1 ]]</template>
             </a-input>
-            <a-input style="width: 50%" v-model.trim="header.value" placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
-                <a-button slot="addonAfter" size="small" @click="inbound.stream.tcp.request.removeHeader(index)">-</a-button>
+            <a-input style="width: 50%" v-model.trim="header.value"
+                placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
+                <a-button slot="addonAfter" size="small"
+                    @click="inbound.stream.tcp.request.removeHeader(index)">-</a-button>
             </a-input>
         </a-input-group>
     </a-form-item>
-        <!-- tcp response -->
-    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.responseVersion" }}'>
+
+    <!-- tcp response -->
+    <a-divider style="margin:0;">{{ i18n "pages.inbounds.stream.general.response" }}</a-divider>
+    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.version" }}'>
         <a-input v-model.trim="inbound.stream.tcp.response.version"></a-input>
     </a-form-item>
-    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.responseStatus" }}'>
+    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.status" }}'>
         <a-input v-model.trim="inbound.stream.tcp.response.status"></a-input>
     </a-form-item>
-    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.responseStatusDescription" }}'>
+    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.statusDescription" }}'>
         <a-input v-model.trim="inbound.stream.tcp.response.reason"></a-input>
     </a-form-item>
     <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.responseHeader" }}'>
@@ -61,16 +66,17 @@
     </a-form-item>
     <a-form-item :wrapper-col="{span:24}">
         <a-input-group compact v-for="(header, index) in inbound.stream.tcp.response.headers">
-            <a-input style="width: 50%" v-model.trim="header.name" placeholder='{{ i18n "pages.inbounds.stream.general.name" }}'>
+            <a-input style="width: 50%" v-model.trim="header.name"
+                placeholder='{{ i18n "pages.inbounds.stream.general.name" }}'>
                 <template slot="addonBefore" style="margin: 0;">[[ index+1 ]]</template>
             </a-input>
             <a-input style="width: 50%" v-model.trim="header.value"
-                        placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
+                placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
                 <template slot="addonAfter">
                     <a-button size="small" @click="inbound.stream.tcp.response.removeHeader(index)">-</a-button>
                 </template>
             </a-input>
         </a-input-group>
     </a-form-item>
 </a-form>
-{{end}}
+{{end}}
diff --git a/web/html/xui/form/stream/stream_ws.html b/web/html/xui/form/stream/stream_ws.html
@@ -6,7 +6,7 @@
     <a-form-item label='{{ i18n "path" }}'>
         <a-input v-model.trim="inbound.stream.ws.path"></a-input>
     </a-form-item>
-    <a-form-item label='{{ i18n "pages.inbounds.stream.general.requestHeader" }}'>
+    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.requestHeader" }}'>
         <a-button size="small" @click="inbound.stream.ws.addHeader()">+</a-button>
     </a-form-item>
     <a-form-item :wrapper-col="{span:24}">

diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="{{ .base_path }}assets/codemirror/lint/lint.css">
 
 <script src="{{ .base_path }}assets/base64/base64.min.js"></script>
-<script src="{{ .base_path }}assets/js/model/outbound.js"></script>
+<script src="{{ .base_path }}assets/js/model/outbound.js?{{ .cur_ver }}"></script>
 <script src="{{ .base_path }}assets/codemirror/codemirror.js"></script>
 <script src="{{ .base_path }}assets/codemirror/javascript.js"></script>
 <script src="{{ .base_path }}assets/codemirror/jshint.js"></script>

diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
@@ -204,17 +204,18 @@
 "obtain" = "Obtain"
 
 [pages.inbounds.stream.general]
-"requestHeader" = "Request Header"
+"request" = "Request"
+"response" = "Response"
 "name" = "Name"
 "value" = "Value"
 
 [pages.inbounds.stream.tcp]
-"requestVersion" = "Request Version"
-"requestMethod" = "Request Method"
-"requestPath" = "Request Path"
-"responseVersion" = "Response Version"
-"responseStatus" = "Response Status"
-"responseStatusDescription" = "Response Status Description"
+"version" = "Version"
+"method" = "Method"
+"path" = "Path"
+"status" = "Status"
+"statusDescription" = "Status Description"
+"requestHeader" = "Request Header"
 "responseHeader" = "Response Header"
 
 [pages.inbounds.stream.quic]

diff --git a/web/translation/translate.es_ES.toml b/web/translation/translate.es_ES.toml
@@ -204,18 +204,19 @@
 "obtain" = "Recibir"
 
 [pages.inbounds.stream.general]
-"requestHeader" = "Encabezado de la Petición"
+"request" = "Pedido"
+"response" = "Respuesta"
 "name" = "Nombre"
 "value" = "Valor"
 
 [pages.inbounds.stream.tcp]
-"requestVersion" = "Versión de la Petición"
-"requestMethod" = "Método de la Petición"
-"requestPath" = "Ruta de la Petición"
-"responseVersion" = "Versión de la Respuesta"
-"responseStatus" = "Estado de la Respuesta"
-"responseStatusDescription" = "Descripción del Estado de la Respuesta"
-"responseHeader" = "Encabezado de la Respuesta"
+"version" = "Versión"
+"method" = "Método"
+"path" = "Camino"
+"status" = "Estado"
+"statusDescription" = "Descripción de la Situación"
+"requestHeader" = "Encabezado de solicitud"
+"responseHeader" = "Encabezado de respuesta"
 
 [pages.inbounds.stream.quic]
 "encryption" = "Cifrado"

diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml
@@ -204,17 +204,18 @@
 "obtain" = "Obtain"
 
 [pages.inbounds.stream.general]
-"requestHeader" = "درخواست سربرگ"
+"request" = "درخواست"
+"response" = "پاسخ"
 "name" = "نام"
 "value" = "مقدار"
 
 [pages.inbounds.stream.tcp]
-"requestVersion" = "ورژن درخواست"
-"requestMethod" = "متد درخواست"
-"requestPath" = "مسیر درخواست"
-"responseVersion" = "ورژن پاسخ"
-"responseStatus" = "وضعیت پاسخ"
-"responseStatusDescription" = "توضیحات وضعیت پاسخ"
+"version" = "ورژن"
+"method" = "متد"
+"path" = "مسیر"
+"status" = "وضعیت"
+"statusDescription" = "توضیحات وضعیت"
+"requestHeader" = "سربرگ درخواست"
 "responseHeader" = "سربرگ پاسخ"
 
 [pages.inbounds.stream.quic]

diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml
@@ -204,17 +204,18 @@
 "obtain" = "Получить"
 
 [pages.inbounds.stream.general]
-"requestHeader" = "Заголовок запроса"
+"request" = "Запрос"
+"response" = "Ответ"
 "name" = "Имя"
-"value" = "Значение"
+"value" = "Ценить"
 
 [pages.inbounds.stream.tcp]
-"requestVersion" = "Версия запроса"
-"requestMethod" = "Метод запроса"
-"requestPath" = "Путь запроса"
-"responseVersion" = "Версия ответа"
-"responseStatus" = "Статус ответа"
-"responseStatusDescription" = "Описание статуса ответа"
+"version" = "Версия"
+"method" = "Метод"
+"path" = "Путь"
+"status" = "Положение дел"
+"statusDescription" = "Описание статуса"
+"requestHeader" = "Заголовок запроса"
 "responseHeader" = "Заголовок ответа"
 
 [pages.inbounds.stream.quic]

diff --git a/web/translation/translate.vi_VN.toml b/web/translation/translate.vi_VN.toml
@@ -204,17 +204,18 @@
 "obtain" = "Nhận"
 
 [pages.inbounds.stream.general]
-"requestHeader" = "Tiêu đề yêu cầu"
+"request" = "Lời yêu cầu"
+"response" = "Phản ứng"
 "name" = "Tên"
 "value" = "Giá trị"
 
 [pages.inbounds.stream.tcp]
-"requestVersion" = "Phiên bản yêu cầu"
-"requestMethod" = "Phương thức yêu cầu"
-"requestPath" = "Đường dẫn yêu cầu"
-"responseVersion" = "Phiên bản phản hồi"
-"responseStatus" = "Trạng thái phản hồi"
-"responseStatusDescription" = "Mô tả trạng thái phản hồi"
+"version" = "Phiên bản"
+"method" = "Phương pháp"
+"path" = "Con đường"
+"status" = "Trạng thái"
+"statusDescription" = "Tình trạng Mô tả"
+"requestHeader" = "Tiêu đề yêu cầu"
 "responseHeader" = "Tiêu đề phản hồi"
 
 [pages.inbounds.stream.quic]

diff --git a/web/translation/translate.zh_Hans.toml b/web/translation/translate.zh_Hans.toml
@@ -204,17 +204,18 @@
 "obtain" = "获取"
 
 [pages.inbounds.stream.general]
-"requestHeader" = "请求头"
-"name" = "名称"
-"value" = "值"
+"request" = "要求"
+"response" = "回复"
+"name" = "姓名"
+"value" = "价值"
 
 [pages.inbounds.stream.tcp]
-"requestVersion" = "请求版本"
-"requestMethod" = "请求方法"
-"requestPath" = "请求路径"
-"responseVersion" = "响应版本"
-"responseStatus" = "响应状态"
-"responseStatusDescription" = "响应状态说明"
+"version" = "版本"
+"method" = "方法"
+"path" = "小路"
+"status" = "地位"
+"statusDescription" = "状态说明"
+"requestHeader" = "请求头"
 "responseHeader" = "响应头"
 
 [pages.inbounds.stream.quic]