Merge pull request #1489 from MHSanaei/main

update

web/assets/js/model/xray.js

@@ -459,9 +459,9 @@ class SplitHTTPStreamSettings extends XrayCommonClass {
         noSSEHeader = false,
         xPaddingBytes = "100-1000",
         xmux = { 
-            maxConcurrency: 0,
+            maxConcurrency: "16-32",
             maxConnections: 0,
-            cMaxReuseTimes: 0,
+            cMaxReuseTimes: "64-128",
             cMaxLifetimeMs: 0
         }
     ) {

web/html/xui/form/stream/stream_splithttp.html

@@ -4,18 +4,21 @@
         <a-input v-model.trim="inbound.stream.splithttp.host"></a-input>
     </a-form-item>
     <a-form-item label='{{ i18n "path" }}'>
-      <a-input v-model.trim="inbound.stream.splithttp.path"></a-input>
+        <a-input v-model.trim="inbound.stream.splithttp.path"></a-input>
     </a-form-item>
     <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.requestHeader" }}'>
-      <a-button icon="plus" size="small" @click="inbound.stream.splithttp.addHeader('host', '')"></a-button>
+        <a-button icon="plus" size="small" @click="inbound.stream.splithttp.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.splithttp.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.splithttp.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.splithttp.removeHeader(index)">-</a-button>
             </a-input>
         </a-input-group>
     </a-form-item>
@@ -35,16 +38,16 @@
         <a-switch v-model="inbound.stream.splithttp.noSSEHeader"></a-switch>
     </a-form-item>
     <a-form-item label="Max Concurrency" v-if="!inbound.stream.splithttp.xmux.maxConnections">
-        <a-input-number v-model="inbound.stream.splithttp.xmux.maxConcurrency"></a-input-number>
+        <a-input v-model="inbound.stream.splithttp.xmux.maxConcurrency"></a-input>
     </a-form-item>
     <a-form-item label="Max Connections" v-if="!inbound.stream.splithttp.xmux.maxConcurrency">
-        <a-input-number v-model="inbound.stream.splithttp.xmux.maxConnections"></a-input-number>
+        <a-input v-model="inbound.stream.splithttp.xmux.maxConnections"></a-input>
     </a-form-item>
     <a-form-item label="Max Reuse Times">
-        <a-input-number v-model="inbound.stream.splithttp.xmux.cMaxReuseTimes"></a-input-number>
+        <a-input v-model="inbound.stream.splithttp.xmux.cMaxReuseTimes"></a-input>
     </a-form-item>
     <a-form-item label="Max Lifetime (ms)">
-        <a-input-number v-model="inbound.stream.splithttp.xmux.cMaxLifetimeMs"></a-input-number>
+        <a-input v-model="inbound.stream.splithttp.xmux.cMaxLifetimeMs"></a-input>
     </a-form-item>
 </a-form>
-{{end}}
+{{end}}

web/html/xui/index.html

@@ -296,6 +296,7 @@
                         <a-select-option value="20">20</a-select-option>
                         <a-select-option value="50">50</a-select-option>
                         <a-select-option value="100">100</a-select-option>
+                        <a-select-option value="500">500</a-select-option>
                     </a-select>
                     <a-select v-model="logModal.level" style="width:100px;"
                     @change="openLogs()" :dropdown-class-name="themeSwitcher.currentTheme">

web/service/config.json

@@ -1,34 +1,44 @@
 {
-  "log": {
-    "loglevel": "warning"
-  },
   "api": {
-    "tag": "api",
-    "services": ["HandlerService", "LoggerService", "StatsService"]
+    "services": [
+      "HandlerService",
+      "LoggerService",
+      "StatsService"
+    ],
+    "tag": "api"
   },
   "inbounds": [
     {
-      "tag": "api",
       "listen": "127.0.0.1",
       "port": 62789,
       "protocol": "dokodemo-door",
       "settings": {
         "address": "127.0.0.1"
-      }
+      },
+      "tag": "api"
     }
   ],
+  "log": {
+    "access": "none",
+    "dnsLog": false,
+    "error": "",
+    "loglevel": "warning",
+    "maskAddress": ""
+  },
   "outbounds": [
     {
-      "tag": "direct",
       "protocol": "freedom",
       "settings": {
-        "domainStrategy": "UseIP"
-      }
+        "domainStrategy": "UseIP",
+        "noises": [],
+        "redirect": ""
+      },
+      "tag": "direct"
     },
     {
-      "tag": "blocked",
       "protocol": "blackhole",
-      "settings": {}
+      "settings": {},
+      "tag": "blocked"
     }
   ],
   "policy": {
@@ -47,19 +57,25 @@
     "domainStrategy": "AsIs",
     "rules": [
       {
-        "type": "field",
-        "inboundTag": ["api"],
-        "outboundTag": "api"
+        "inboundTag": [
+          "api"
+        ],
+        "outboundTag": "api",
+        "type": "field"
       },
       {
-        "type": "field",
+        "ip": [
+          "geoip:private"
+        ],
         "outboundTag": "blocked",
-        "ip": ["geoip:private"]
+        "type": "field"
       },
       {
-        "type": "field",
         "outboundTag": "blocked",
-        "protocol": ["bittorrent"]
+        "protocol": [
+          "bittorrent"
+        ],
+        "type": "field"
       }
     ]
   },

web/session/session.go

@@ -5,7 +5,7 @@ import (
 
 	"x-ui/database/model"
 
-	sessions "github.com/Calidity/gin-sessions"
+	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
 )
 

web/web.go

@@ -24,9 +24,9 @@ import (
 	"x-ui/web/network"
 	"x-ui/web/service"
 
-	sessions "github.com/Calidity/gin-sessions"
-	"github.com/Calidity/gin-sessions/cookie"
 	"github.com/gin-contrib/gzip"
+	"github.com/gin-contrib/sessions"
+	"github.com/gin-contrib/sessions/cookie"
 	"github.com/gin-gonic/gin"
 	"github.com/robfig/cron/v3"
 )
@@ -332,13 +332,13 @@ func (s *Server) Start() (err error) {
 			}
 			listener = network.NewAutoHttpsListener(listener)
 			listener = tls.NewListener(listener, c)
-			logger.Info("web server run https on", listener.Addr())
+			logger.Info("Web server running HTTPS on", listener.Addr())
 		} else {
-			logger.Error("error in loading certificates: ", err)
-			logger.Info("web server run http on", listener.Addr())
+			logger.Error("Error loading certificates:", err)
+			logger.Info("Web server running HTTP on", listener.Addr())
 		}
 	} else {
-		logger.Info("web server run http on", listener.Addr())
+		logger.Info("Web server running HTTP on", listener.Addr())
 	}
 	s.listener = listener