fix(models): enforce string type for numeric range fields in xHTTP and xMux settings

Author: x0sina

app/models/host.py

@@ -63,19 +63,19 @@ class NoiseSettings(BaseModel):
 
 
 class XMuxSettings(BaseModel):
-    max_concurrency: str | int | None = Field(
+    max_concurrency: str | None = Field(
         None, pattern=r"^\d{1,16}(-\d{1,16})?$", serialization_alias="maxConcurrency"
     )
-    max_connections: str | int | None = Field(
+    max_connections: str | None = Field(
         None, pattern=r"^\d{1,16}(-\d{1,16})?$", serialization_alias="maxConnections"
     )
-    c_max_reuse_times: str | int | None = Field(
+    c_max_reuse_times: str | None = Field(
         None, pattern=r"^\d{1,16}(-\d{1,16})?$", serialization_alias="cMaxReuseTimes"
     )
-    h_max_reusable_secs: str | int | None = Field(
+    h_max_reusable_secs: str | None = Field(
         None, pattern=r"^\d{1,16}(-\d{1,16})?$", serialization_alias="hMaxReusableSecs"
     )
-    h_max_request_times: str | int | None = Field(
+    h_max_request_times: str | None = Field(
         None, pattern=r"^\d{1,16}(-\d{1,16})?$", serialization_alias="hMaxRequestTimes"
     )
     h_keep_alive_period: int | None = Field(None, serialization_alias="hKeepAlivePeriod")
@@ -98,7 +98,7 @@ def normalize_numeric_or_range_fields(cls, value):
 class XHttpSettings(BaseModel):
     mode: XHttpModes | None = Field(default=None)
     no_grpc_header: bool | None = Field(default=None)
-    x_padding_bytes: str | int | None = Field(default=None, pattern=r"^\d{1,16}(-\d{1,16})?$")
+    x_padding_bytes: str | None = Field(default=None, pattern=r"^\d{1,16}(-\d{1,16})?$")
     x_padding_obfs_mode: bool | None = Field(default=None)
     x_padding_key: str | None = Field(default=None)
     x_padding_header: str | None = Field(default=None)
@@ -111,9 +111,9 @@ class XHttpSettings(BaseModel):
     seq_key: str | None = Field(default=None)
     uplink_data_placement: str | None = Field(default=None, pattern=r"^$|^(body|cookie|header)$")
     uplink_data_key: str | None = Field(default=None)
-    uplink_chunk_size: str | int | None = Field(default=None, pattern=r"^\d{1,16}(-\d{1,16})?$")
-    sc_max_each_post_bytes: str | int | None = Field(default=None, pattern=r"^\d{1,16}(-\d{1,16})?$")
-    sc_min_posts_interval_ms: str | int | None = Field(default=None, pattern=r"^\d{1,16}(-\d{1,16})?$")
+    uplink_chunk_size: str | None = Field(default=None, pattern=r"^\d{1,16}(-\d{1,16})?$")
+    sc_max_each_post_bytes: str | None = Field(default=None, pattern=r"^\d{1,16}(-\d{1,16})?$")
+    sc_min_posts_interval_ms: str | None = Field(default=None, pattern=r"^\d{1,16}(-\d{1,16})?$")
     xmux: XMuxSettings | None = Field(default=None)
     download_settings: int | None = Field(default=None)
 

app/models/subscription.py

@@ -98,13 +98,13 @@ class XHTTPTransportConfig(BaseTransportConfig):
 
     mode: str = Field("auto")
     no_grpc_header: bool | None = Field(None)
-    sc_max_each_post_bytes: str | int | None = Field(
+    sc_max_each_post_bytes: str | None = Field(
         None, serialization_alias="scMaxEachPostBytes", pattern=r"^\d{1,16}(?:-\d{1,16})?$"
     )
-    sc_min_posts_interval_ms: str | int | None = Field(
+    sc_min_posts_interval_ms: str | None = Field(
         None, serialization_alias="scMinPostsIntervalMs", pattern=r"^\d{1,16}(?:-\d{1,16})?$"
     )
-    x_padding_bytes: str | int | None = Field(
+    x_padding_bytes: str | None = Field(
         None, serialization_alias="xPaddingBytes", pattern=r"^\d{1,16}(?:-\d{1,16})?$"
     )
     x_padding_obfs_mode: bool | None = Field(None, serialization_alias="xPaddingObfsMode")
@@ -119,7 +119,7 @@ class XHTTPTransportConfig(BaseTransportConfig):
     seq_key: str | None = Field(None, serialization_alias="seqKey")
     uplink_data_placement: str | None = Field(None, serialization_alias="uplinkDataPlacement")
     uplink_data_key: str | None = Field(None, serialization_alias="uplinkDataKey")
-    uplink_chunk_size: str | int | None = Field(
+    uplink_chunk_size: str | None = Field(
         None, serialization_alias="uplinkChunkSize", pattern=r"^\d{1,16}(?:-\d{1,16})?$"
     )
     xmux: dict[str, Any] | None = Field(None)

tests/test_subscription_clash_xhttp.py

@@ -1,4 +1,5 @@
 from app.core.xray import XRayConfig
+from app.models.host import XHttpSettings, XMuxSettings
 from app.models.subscription import SubscriptionInboundData, TLSConfig, XHTTPTransportConfig
 from app.subscription.clash import ClashConfiguration, ClashMetaConfiguration
 
@@ -250,6 +251,35 @@ def test_xray_parser_reads_xhttp_extra_advanced_fields():
     assert inbound["download_settings"] == {"address": "download.example.com"}
 
 
+def test_xhttp_models_accept_integer_numeric_range_fields_as_strings():
+    transport = XHTTPTransportConfig(
+        sc_max_each_post_bytes=4096,
+        sc_min_posts_interval_ms=30,
+        x_padding_bytes=128,
+        uplink_chunk_size=2048,
+    )
+
+    assert transport.sc_max_each_post_bytes == "4096"
+    assert transport.sc_min_posts_interval_ms == "30"
+    assert transport.x_padding_bytes == "128"
+    assert transport.uplink_chunk_size == "2048"
+
+    host_settings = XHttpSettings(
+        sc_max_each_post_bytes=4096,
+        sc_min_posts_interval_ms=30,
+        x_padding_bytes=128,
+        uplink_chunk_size=2048,
+        xmux=XMuxSettings(max_concurrency=4, max_connections=8),
+    )
+
+    assert host_settings.sc_max_each_post_bytes == "4096"
+    assert host_settings.sc_min_posts_interval_ms == "30"
+    assert host_settings.x_padding_bytes == "128"
+    assert host_settings.uplink_chunk_size == "2048"
+    assert host_settings.xmux.max_concurrency == "4"
+    assert host_settings.xmux.max_connections == "8"
+
+
 def test_xray_parser_does_not_mix_top_level_advanced_fields_when_extra_exists():
     parsed = XRayConfig(
         {