rms/Marzban
1
0
Fork 0
mirror of https://github.com/Gozargah/Marzban.git synced 2026-05-17 08:35:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: xhttp extra in v2ray links (#1476)

Browse Source
This commit is contained in:
Mohammad
2024-12-02 19:02:23 +03:30
committed by GitHub
parent 4708436803
commit b26f6c7b5f
2 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
app/subscription/v2ray.py
View File

@@ -76,10 +76,10 @@ class V2rayShareLink(str):
sc_min_posts_interval_ms=inbound.get('scMinPostsIntervalMs', 30),
x_padding_bytes=inbound.get("xPaddingBytes", "100-1000"),
mode=inbound.get("mode", "auto"),
extra=inbound.get("extra", {}),
noGRPCHeader=inbound.get("noGRPCHeader", False),
heartbeatPeriod=inbound.get("heartbeatPeriod", 0),
keepAlivePeriod=inbound.get("keepAlivePeriod", 0),
xmux=inbound.get("xmux", {}),
)
elif inbound["protocol"] == "vless":
@@ -108,10 +108,10 @@ class V2rayShareLink(str):
sc_min_posts_interval_ms=inbound.get('scMinPostsIntervalMs', 30),
x_padding_bytes=inbound.get("xPaddingBytes", "100-1000"),
mode=inbound.get("mode", "auto"),
extra=inbound.get("extra", {}),
noGRPCHeader=inbound.get("noGRPCHeader", False),
heartbeatPeriod=inbound.get("heartbeatPeriod", 0),
keepAlivePeriod=inbound.get("keepAlivePeriod", 0),
xmux=inbound.get("xmux", {}),
)
elif inbound["protocol"] == "trojan":
@@ -140,10 +140,10 @@ class V2rayShareLink(str):
sc_min_posts_interval_ms=inbound.get('scMinPostsIntervalMs', 30),
x_padding_bytes=inbound.get("xPaddingBytes", "100-1000"),
mode=inbound.get("mode", "auto"),
extra=inbound.get("extra", {}),
noGRPCHeader=inbound.get("noGRPCHeader", False),
heartbeatPeriod=inbound.get("heartbeatPeriod", 0),
keepAlivePeriod=inbound.get("keepAlivePeriod", 0),
xmux=inbound.get("xmux", {}),
)
elif inbound["protocol"] == "shadowsocks":
@@ -185,10 +185,10 @@ class V2rayShareLink(str):
sc_min_posts_interval_ms: int = 30,
x_padding_bytes: str = "100-1000",
mode: str = "auto",
extra: dict = {},
noGRPCHeader: bool = False,
heartbeatPeriod: int = 0,
keepAlivePeriod: int = 0,
xmux: dict = {},
):
payload = {
"add": address,
@@ -233,15 +233,18 @@ class V2rayShareLink(str):
payload["mode"] = "gun"
elif net in ("splithttp", "xhttp"):
payload["scMaxEachPostBytes"] = sc_max_each_post_bytes
payload["scMaxConcurrentPosts"] = sc_max_concurrent_posts
payload["scMinPostsIntervalMs"] = sc_min_posts_interval_ms
payload["xPaddingBytes"] = x_padding_bytes
extra = {
"scMaxEachPostBytes": sc_max_each_post_bytes,
"scMaxConcurrentPosts": sc_max_concurrent_posts,
"scMinPostsIntervalMs": sc_min_posts_interval_ms,
"xPaddingBytes": x_padding_bytes,
"noGRPCHeader": noGRPCHeader,
"keepAlivePeriod": keepAlivePeriod,
}
if xmux:
extra["xmux"] = xmux
payload["type"] = mode
if extra:
payload["extra"] = extra
payload["noGRPCHeader"] = int(noGRPCHeader)
payload["keepAlivePeriod"] = keepAlivePeriod
payload["extra"] = extra
elif net == "ws":
if heartbeatPeriod:
@@ -280,10 +283,10 @@ class V2rayShareLink(str):
sc_min_posts_interval_ms: int = 30,
x_padding_bytes: str = "100-1000",
mode: str = "auto",
extra: dict = {},
noGRPCHeader: bool = False,
heartbeatPeriod: int = 0,
keepAlivePeriod: int = 0,
xmux: dict = {},
):
payload = {
@@ -309,15 +312,18 @@ class V2rayShareLink(str):
elif net in ("splithttp", "xhttp"):
payload["path"] = path
payload["host"] = host
payload["scMaxEachPostBytes"] = sc_max_each_post_bytes
payload["scMaxConcurrentPosts"] = sc_max_concurrent_posts
payload["scMinPostsIntervalMs"] = sc_min_posts_interval_ms
payload["xPaddingBytes"] = x_padding_bytes
payload["mode"] = mode
if extra:
payload["extra"] = json.dumps(extra)
payload["noGRPCHeader"] = int(noGRPCHeader)
payload["keepAlivePeriod"] = keepAlivePeriod
extra = {
"scMaxEachPostBytes": sc_max_each_post_bytes,
"scMaxConcurrentPosts": sc_max_concurrent_posts,
"scMinPostsIntervalMs": sc_min_posts_interval_ms,
"xPaddingBytes": x_padding_bytes,
"noGRPCHeader": noGRPCHeader,
"keepAlivePeriod": keepAlivePeriod,
}
if xmux:
extra["xmux"] = xmux
payload["extra"] = json.dumps(extra)
elif net == 'kcp':
payload['seed'] = path
@@ -384,10 +390,10 @@ class V2rayShareLink(str):
sc_min_posts_interval_ms: int = 30,
x_padding_bytes: str = "100-1000",
mode: str = "auto",
extra: dict = {},
noGRPCHeader: bool = False,
heartbeatPeriod: int = 0,
keepAlivePeriod: int = 0,
xmux: dict = {},
):
payload = {
@@ -409,15 +415,18 @@ class V2rayShareLink(str):
elif net in ("splithttp", "xhttp"):
payload["path"] = path
payload["host"] = host
payload["scMaxEachPostBytes"] = sc_max_each_post_bytes
payload["scMaxConcurrentPosts"] = sc_max_concurrent_posts
payload["scMinPostsIntervalMs"] = sc_min_posts_interval_ms
payload["xPaddingBytes"] = x_padding_bytes
payload["mode"] = mode
if extra:
payload["extra"] = json.dumps(extra)
payload["noGRPCHeader"] = int(noGRPCHeader)
payload["keepAlivePeriod"] = keepAlivePeriod
extra = {
"scMaxEachPostBytes": sc_max_each_post_bytes,
"scMaxConcurrentPosts": sc_max_concurrent_posts,
"scMinPostsIntervalMs": sc_min_posts_interval_ms,
"xPaddingBytes": x_padding_bytes,
"noGRPCHeader": noGRPCHeader,
"keepAlivePeriod": keepAlivePeriod,
}
if xmux:
extra["xmux"] = xmux
payload["extra"] = json.dumps(extra)
elif net == 'quic':
payload['key'] = path
@@ -586,7 +595,6 @@ class V2rayJsonConfig(str):
sc_min_posts_interval_ms: int = 30,
x_padding_bytes: str = "100-1000",
xmux: dict = {},
extra: dict = {},
mode: str = "auto",
noGRPCHeader: bool = False,
keepAlivePeriod: int = 0,
@@ -608,9 +616,6 @@ class V2rayJsonConfig(str):
config["noGRPCHeader"] = noGRPCHeader
if xmux:
config["xmux"] = xmux
if extra:
config["extra"] = extra
config["keepAlivePeriod"] = keepAlivePeriod
# core will ignore unknown variables
@@ -912,7 +917,6 @@ class V2rayJsonConfig(str):
sc_min_posts_interval_ms: int = 30,
x_padding_bytes: str = "100-1000",
xmux: dict = {},
extra: dict = {},
mode: str = "auto",
noGRPCHeader: bool = False,
heartbeatPeriod: int = 0,
@@ -947,7 +951,6 @@ class V2rayJsonConfig(str):
sc_min_posts_interval_ms=sc_min_posts_interval_ms,
x_padding_bytes=x_padding_bytes,
xmux=xmux,
extra=extra,
mode=mode,
noGRPCHeader=noGRPCHeader,
keepAlivePeriod=keepAlivePeriod,
@@ -1059,7 +1062,6 @@ class V2rayJsonConfig(str):
x_padding_bytes=inbound.get("xPaddingBytes", "100-1000"),
xmux=inbound.get("xmux", {}),
mode=inbound.get("mode", "auto"),
extra=inbound.get("extra", {}),
noGRPCHeader=inbound.get("noGRPCHeader", False),
heartbeatPeriod=inbound.get("heartbeatPeriod", 0),
keepAlivePeriod=inbound.get("keepAlivePeriod", 0),

1
app/xray/config.py
View File

@@ -308,7 +308,6 @@ class XRayConfig(dict):
settings['xPaddingBytes'] = net_settings.get('xPaddingBytes', "100-1000")
settings['xmux'] = net_settings.get('xmux', {})
settings["mode"] = net_settings.get("mode", "auto")
settings["extra"] = net_settings.get("extra", {})
settings["noGRPCHeader"] = net_settings.get("noGRPCHeader", False)
settings["keepAlivePeriod"] = net_settings.get("keepAlivePeriod", 0)