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

don't send keepAlivePeriod if it not in the config (#1517)

Browse Source
This commit is contained in:
Mohammad
2024-12-15 16:31:00 +03:30
committed by GitHub
parent 5c217e9694
commit 43ccc2d71a
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/subscription/v2ray.py
View File

@@ -6,12 +6,12 @@ from random import choice
from typing import Union
from urllib.parse import quote
from uuid import UUID
from app.utils.helpers import UUIDEncoder
from jinja2.exceptions import TemplateNotFound
from app.subscription.funcs import get_grpc_gun, get_grpc_multi
from app.templates import render_template
from app.utils.helpers import UUIDEncoder
from config import (
EXTERNAL_CONFIG,
GRPC_USER_AGENT_TEMPLATE,
@@ -240,11 +240,12 @@ class V2rayShareLink(str):
"scMinPostsIntervalMs": sc_min_posts_interval_ms,
"xPaddingBytes": x_padding_bytes,
"noGRPCHeader": noGRPCHeader,
"keepAlivePeriod": keepAlivePeriod,
}
if xmux:
extra["xmux"] = xmux
payload["type"] = mode
if keepAlivePeriod > 0:
extra["keepAlivePeriod"] = keepAlivePeriod
payload["extra"] = extra
elif net == "ws":
@@ -320,8 +321,9 @@ class V2rayShareLink(str):
"scMinPostsIntervalMs": sc_min_posts_interval_ms,
"xPaddingBytes": x_padding_bytes,
"noGRPCHeader": noGRPCHeader,
"keepAlivePeriod": keepAlivePeriod,
}
if keepAlivePeriod > 0:
extra["keepAlivePeriod"] = keepAlivePeriod
if xmux:
extra["xmux"] = xmux
payload["extra"] = json.dumps(extra)
@@ -423,8 +425,9 @@ class V2rayShareLink(str):
"scMinPostsIntervalMs": sc_min_posts_interval_ms,
"xPaddingBytes": x_padding_bytes,
"noGRPCHeader": noGRPCHeader,
"keepAlivePeriod": keepAlivePeriod,
}
if keepAlivePeriod > 0:
extra["keepAlivePeriod"] = keepAlivePeriod
if xmux:
extra["xmux"] = xmux
payload["extra"] = json.dumps(extra)
@@ -518,7 +521,7 @@ class V2rayJsonConfig(str):
def render(self, reverse=False):
if reverse:
self.config.reverse()
return json.dumps(self.config, indent=4,cls=UUIDEncoder)
return json.dumps(self.config, indent=4, cls=UUIDEncoder)
@staticmethod
def tls_config(sni=None, fp=None, alpn=None, ais: bool = False) -> dict:
@@ -617,7 +620,8 @@ class V2rayJsonConfig(str):
config["noGRPCHeader"] = noGRPCHeader
if xmux:
config["xmux"] = xmux
config["keepAlivePeriod"] = keepAlivePeriod
if keepAlivePeriod > 0:
config["keepAlivePeriod"] = keepAlivePeriod
# core will ignore unknown variables
return config