Merge pull request #1607 from shraiton/master

add real upload/download splitting to xhttp
Gozargah · Jan 18, 2025 · 03dbcc1 · 03dbcc1
2 parents 2353e3f + d53b46c
commit 03dbcc1
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 17 deletions.
diff --git a/app/__init__.py b/app/__init__.py
@@ -10,7 +10,7 @@
 
 from config import ALLOWED_ORIGINS, DOCS, XRAY_SUBSCRIPTION_PATH
 
-__version__ = "0.8.2"
+__version__ = "0.8.4"
 
 app = FastAPI(
     title="MarzbanAPI",

diff --git a/app/subscription/v2ray.py b/app/subscription/v2ray.py
@@ -81,6 +81,7 @@ def add(self, remark: str, address: str, inbound: dict, settings: dict):
                 heartbeatPeriod=inbound.get("heartbeatPeriod", 0),
                 keepAlivePeriod=inbound.get("keepAlivePeriod", 0),
                 xmux=inbound.get("xmux", {}),
+                downloadSettings=inbound.get("downloadSettings",{})
             )
 
         elif inbound["protocol"] == "vless":
@@ -113,6 +114,7 @@ def add(self, remark: str, address: str, inbound: dict, settings: dict):
                 heartbeatPeriod=inbound.get("heartbeatPeriod", 0),
                 keepAlivePeriod=inbound.get("keepAlivePeriod", 0),
                 xmux=inbound.get("xmux", {}),
+                downloadSettings=inbound.get("downloadSettings",{})
             )
 
         elif inbound["protocol"] == "trojan":
@@ -145,6 +147,7 @@ def add(self, remark: str, address: str, inbound: dict, settings: dict):
                 heartbeatPeriod=inbound.get("heartbeatPeriod", 0),
                 keepAlivePeriod=inbound.get("keepAlivePeriod", 0),
                 xmux=inbound.get("xmux", {}),
+                downloadSettings=inbound.get("downloadSettings",{})
             )
 
         elif inbound["protocol"] == "shadowsocks":
@@ -190,6 +193,7 @@ def vmess(
             heartbeatPeriod: int = 0,
             keepAlivePeriod: int = 0,
             xmux: dict = {},
+            downloadSettings: dict = {},
     ):
         payload = {
             "add": address,
@@ -243,10 +247,11 @@ def vmess(
             }
             if xmux:
                 extra["xmux"] = xmux
+            if downloadSettings:
+                extra["downloadSettings"] = downloadSettings
             payload["type"] = mode
-            if keepAlivePeriod > 0:
-                extra["keepAlivePeriod"] = keepAlivePeriod
-            payload["extra"] = extra
+
+            payload["extra"] = (json.dumps(extra)).replace(" ","")
 
         elif net == "ws":
             if heartbeatPeriod:
@@ -289,6 +294,7 @@ def vless(cls,
               heartbeatPeriod: int = 0,
               keepAlivePeriod: int = 0,
               xmux: dict = {},
+              downloadSettings: dict = {},
               ):
 
         payload = {
@@ -322,11 +328,11 @@ def vless(cls,
                 "xPaddingBytes": x_padding_bytes,
                 "noGRPCHeader": noGRPCHeader,
             }
-            if keepAlivePeriod > 0:
-                extra["keepAlivePeriod"] = keepAlivePeriod
             if xmux:
                 extra["xmux"] = xmux
-            payload["extra"] = json.dumps(extra)
+            if downloadSettings:
+                extra["downloadSettings"] = downloadSettings
+            payload["extra"] = (json.dumps(extra)).replace(" ","")
 
         elif net == 'kcp':
             payload['seed'] = path
@@ -397,6 +403,7 @@ def trojan(cls,
                heartbeatPeriod: int = 0,
                keepAlivePeriod: int = 0,
                xmux: dict = {},
+               downloadSettings: dict = {},
                ):
 
         payload = {
@@ -426,11 +433,11 @@ def trojan(cls,
                 "xPaddingBytes": x_padding_bytes,
                 "noGRPCHeader": noGRPCHeader,
             }
-            if keepAlivePeriod > 0:
-                extra["keepAlivePeriod"] = keepAlivePeriod
             if xmux:
                 extra["xmux"] = xmux
-            payload["extra"] = json.dumps(extra)
+            if downloadSettings:
+                extra["downloadSettings"] = downloadSettings
+            payload["extra"] = (json.dumps(extra)).replace(" ","")
 
         elif net == 'quic':
             payload['key'] = path
@@ -599,6 +606,7 @@ def splithttp_config(self, path: str = "", host: str = "", random_user_agent: bo
                          sc_min_posts_interval_ms: int = 30,
                          x_padding_bytes: str = "100-1000",
                          xmux: dict = {},
+                         downloadSettings: dict = {},
                          mode: str = "auto",
                          noGRPCHeader: bool = False,
                          keepAlivePeriod: int = 0,
@@ -620,6 +628,8 @@ def splithttp_config(self, path: str = "", host: str = "", random_user_agent: bo
         config["noGRPCHeader"] = noGRPCHeader
         if xmux:
             config["xmux"] = xmux
+        if downloadSettings:
+            config["downloadSettings"] = downloadSettings
         if keepAlivePeriod > 0:
             config["keepAlivePeriod"] = keepAlivePeriod
         # core will ignore unknown variables
@@ -922,6 +932,7 @@ def make_stream_setting(self,
                             sc_min_posts_interval_ms: int = 30,
                             x_padding_bytes: str = "100-1000",
                             xmux: dict = {},
+                            downloadSettings: dict = {},
                             mode: str = "auto",
                             noGRPCHeader: bool = False,
                             heartbeatPeriod: int = 0,
@@ -956,6 +967,7 @@ def make_stream_setting(self,
                                                     sc_min_posts_interval_ms=sc_min_posts_interval_ms,
                                                     x_padding_bytes=x_padding_bytes,
                                                     xmux=xmux,
+                                                    downloadSettings=downloadSettings,
                                                     mode=mode,
                                                     noGRPCHeader=noGRPCHeader,
                                                     keepAlivePeriod=keepAlivePeriod,
@@ -1066,6 +1078,7 @@ def add(self, remark: str, address: str, inbound: dict, settings: dict):
             sc_min_posts_interval_ms=inbound.get('scMinPostsIntervalMs', 30),
             x_padding_bytes=inbound.get("xPaddingBytes", "100-1000"),
             xmux=inbound.get("xmux", {}),
+            downloadSettings=inbound.get("downloadSettings",{}),
             mode=inbound.get("mode", "auto"),
             noGRPCHeader=inbound.get("noGRPCHeader", False),
             heartbeatPeriod=inbound.get("heartbeatPeriod", 0),

diff --git a/app/xray/config.py b/app/xray/config.py
@@ -303,14 +303,16 @@ def _resolve_inbounds(self):
                     settings['path'] = net_settings.get('path', '')
                     host = net_settings.get('host', '')
                     settings['host'] = [host]
-                    settings['scMaxEachPostBytes'] = net_settings.get('scMaxEachPostBytes', 1000000)
-                    settings['scMaxConcurrentPosts'] = net_settings.get('scMaxConcurrentPosts', 100)
-                    settings['scMinPostsIntervalMs'] = net_settings.get('scMinPostsIntervalMs', 30)
-                    settings['xPaddingBytes'] = net_settings.get('xPaddingBytes', "100-1000")
-                    settings['xmux'] = net_settings.get('xmux', {})
+                    extra = net_settings.get('extra',{})
+                    settings['scMaxEachPostBytes'] = extra.get('scMaxEachPostBytes', 1000000)
+                    settings['scMaxConcurrentPosts'] = extra.get('scMaxConcurrentPosts', 100)
+                    settings['scMinPostsIntervalMs'] = extra.get('scMinPostsIntervalMs', 30)
+                    settings['xPaddingBytes'] = extra.get('xPaddingBytes', "100-1000")
+                    settings["noGRPCHeader"] = extra.get("noGRPCHeader", False)
+                    settings['xmux'] = extra.get('xmux',{})
+                    settings['downloadSettings'] = extra.get('downloadSettings',{})
                     settings["mode"] = net_settings.get("mode", "auto")
-                    settings["noGRPCHeader"] = net_settings.get("noGRPCHeader", False)
-                    settings["keepAlivePeriod"] = net_settings.get("keepAlivePeriod", 0)
+                    settings["keepAlivePeriod"] = net_settings.get("keepAlivePeriod", 0) #documentation says it's moved to hKeepAlivePeriod
 
                 elif net == 'kcp':
                     header = net_settings.get('header', {})