refactor(subscription): remove flow_enabled field and simplify flow handling

Author: ImMohammad20000

app/core/hosts.py

@@ -342,19 +342,6 @@ async def _prepare_subscription_inbound_data(
             random_user_agent=host.random_user_agent,
         )
 
-    # Compute flow_enabled: VLESS flow is serialized for TLS/REALITY or for
-    # security=none when the inbound has VLESS encryption.
-    header_type = getattr(transport_config, "header_type", "none")
-    flow_security_enabled = tls_value in ("tls", "reality") or (
-        tls_value in ("", "none", None) and encryption not in ("", "none", None)
-    )
-    flow_enabled = (
-        protocol == "vless"
-        and flow_security_enabled
-        and network in ("tcp", "raw", "kcp")
-        and header_type != "http"
-    )
-
     return SubscriptionInboundData(
         remark=host.remark,
         inbound_tag=host.inbound_tag,
@@ -371,7 +358,6 @@ async def _prepare_subscription_inbound_data(
         encryption=encryption,
         vless_route=host.vless_route,
         inbound_flow=inbound_flow,
-        flow_enabled=flow_enabled,
         random_user_agent=host.random_user_agent,
         use_sni_as_host=host.use_sni_as_host,
         fragment_settings=host.fragment_settings.model_dump() if host.fragment_settings else None,

app/models/subscription.py

@@ -256,7 +256,6 @@ class SubscriptionInboundData(BaseModel):
 
     # Flow (from inbound, user can override)
     inbound_flow: str = Field("")
-    flow_enabled: bool = Field(False)  # Computed once: if this inbound supports flow
 
     # Additional settings
     random_user_agent: bool = Field(False)

app/subscription/clash.py

@@ -432,7 +432,7 @@ def _build_vless(self, remark: str, address: str, inbound: SubscriptionInboundDa
         if inbound.encryption != "none":
             node["encryption"] = inbound.encryption
 
-        if inbound.flow_enabled and (flow := inbound.inbound_flow):
+        if flow := inbound.inbound_flow:
             node["flow"] = flow
 
         self._apply_tls(node, inbound.tls_config, "vless")

app/subscription/links.py

@@ -268,7 +268,7 @@ def _build_vless(self, remark: str, address: str, inbound: SubscriptionInboundDa
             "headerType": getattr(inbound.transport_config, "header_type", "none"),
         }
 
-        if inbound.flow_enabled and (flow := inbound.inbound_flow):
+        if flow := inbound.inbound_flow:
             payload["flow"] = flow
 
         self._apply_transport_settings(payload, "vless", inbound, path)

app/subscription/singbox.py

@@ -166,15 +166,13 @@ def _transport_ws(self, config: WebSocketTransportConfig, path: str) -> dict:
 
     def _transport_grpc(self, config: GRPCTransportConfig, path: str) -> dict:
         """Handle GRPC transport - only gets GRPC config"""
-        return self._normalize_and_remove_none_values(
-            {
-                "type": "grpc",
-                "service_name": path,
-                "idle_timeout": f"{config.idle_timeout}s" if config.idle_timeout else "15s",
-                "ping_timeout": f"{config.health_check_timeout}s" if config.health_check_timeout else "15s",
-                "permit_without_stream": config.permit_without_stream,
-            }
-        )
+        return self._normalize_and_remove_none_values({
+            "type": "grpc",
+            "service_name": path,
+            "idle_timeout": f"{config.idle_timeout}s" if config.idle_timeout else "15s",
+            "ping_timeout": f"{config.health_check_timeout}s" if config.health_check_timeout else "15s",
+            "permit_without_stream": config.permit_without_stream,
+        })
 
     def _transport_httpupgrade(self, config: WebSocketTransportConfig, path: str) -> dict:
         """Handle HTTPUpgrade transport - only gets WS config (similar to WS)"""
@@ -274,7 +272,7 @@ def _build_vless(self, remark: str, address: str, inbound: SubscriptionInboundDa
             id = self.vless_route(id, inbound.vless_route)
         user_settings = {"uuid": id}
 
-        if inbound.flow_enabled and (flow := inbound.inbound_flow):
+        if flow := inbound.inbound_flow:
             user_settings["flow"] = flow
 
         return self._build_outbound(

app/subscription/xray.py

@@ -274,27 +274,23 @@ def _transport_quic(self, config: QUICTransportConfig, path: str) -> dict:
         """Handle QUIC transport - only gets QUIC config"""
         host = config.host if isinstance(config.host, str) else (config.host[0] if config.host else "")
 
-        return self._normalize_and_remove_none_values(
-            {
-                "security": host,
-                "header": {"type": config.header_type},
-                "key": path,
-            }
-        )
+        return self._normalize_and_remove_none_values({
+            "security": host,
+            "header": {"type": config.header_type},
+            "key": path,
+        })
 
     def _transport_kcp(self, config: KCPTransportConfig, path: str) -> dict:
         """Handle KCP transport - only gets KCP config"""
-        return self._normalize_and_remove_none_values(
-            {
-                "mtu": config.mtu if config.mtu is not None else 1350,
-                "tti": config.tti if config.tti is not None else 50,
-                "uplinkCapacity": config.uplink_capacity if config.uplink_capacity is not None else 5,
-                "downlinkCapacity": config.downlink_capacity if config.downlink_capacity is not None else 20,
-                "congestion": config.congestion,
-                "readBufferSize": config.read_buffer_size if config.read_buffer_size is not None else 2,
-                "writeBufferSize": config.write_buffer_size if config.write_buffer_size is not None else 2,
-            }
-        )
+        return self._normalize_and_remove_none_values({
+            "mtu": config.mtu if config.mtu is not None else 1350,
+            "tti": config.tti if config.tti is not None else 50,
+            "uplinkCapacity": config.uplink_capacity if config.uplink_capacity is not None else 5,
+            "downlinkCapacity": config.downlink_capacity if config.downlink_capacity is not None else 20,
+            "congestion": config.congestion,
+            "readBufferSize": config.read_buffer_size if config.read_buffer_size is not None else 2,
+            "writeBufferSize": config.write_buffer_size if config.write_buffer_size is not None else 2,
+        })
 
     def _apply_transport(self, network: str, inbound: SubscriptionInboundData, path: str) -> dict | None:
         """Apply transport settings using registry pattern"""
@@ -310,17 +306,15 @@ def _apply_tls(self, tls_config: TLSConfig, security: str) -> dict:
         sni = tls_config.sni if isinstance(tls_config.sni, str) else (tls_config.sni[0] if tls_config.sni else None)
 
         if security == "reality":
-            return self._normalize_and_remove_none_values(
-                {
-                    "serverName": sni,
-                    "fingerprint": tls_config.fingerprint,
-                    "show": False,
-                    "publicKey": tls_config.reality_public_key,
-                    "shortId": tls_config.reality_short_id,
-                    "spiderX": tls_config.reality_spx,
-                    "mldsa65Verify": tls_config.mldsa65_verify,
-                }
-            )
+            return self._normalize_and_remove_none_values({
+                "serverName": sni,
+                "fingerprint": tls_config.fingerprint,
+                "show": False,
+                "publicKey": tls_config.reality_public_key,
+                "shortId": tls_config.reality_short_id,
+                "spiderX": tls_config.reality_spx,
+                "mldsa65Verify": tls_config.mldsa65_verify,
+            })
         else:  # tls
             config = {
                 "serverName": sni,
@@ -389,13 +383,11 @@ def _download_config(self, download_settings: SubscriptionInboundData, link_form
             sockopt=sockopt,
         )
 
-        return self._normalize_and_remove_none_values(
-            {
-                "address": download_settings.address,
-                "port": self._select_port(download_settings.port),
-                **stream_settings,
-            }
-        )
+        return self._normalize_and_remove_none_values({
+            "address": download_settings.address,
+            "port": self._select_port(download_settings.port),
+            **stream_settings,
+        })
 
     # ========== Protocol Builders (Registry Methods) ==========
 
@@ -417,7 +409,7 @@ def _build_vless(self, address: str, inbound: SubscriptionInboundData, settings:
 
         user_settings = {"id": id, "encryption": inbound.encryption}
 
-        if inbound.flow_enabled and (flow := inbound.inbound_flow):
+        if flow := inbound.inbound_flow:
             user_settings["flow"] = flow
 
         return self._build_outbound(