feat: 减少内网的数据转发

Author: tianxiu2b2t

core/config.py

@@ -103,6 +103,10 @@ def cluster_up_failed_times(self) -> int:
     @property
     def cluster_up_failed_interval(self) -> datetime.timedelta: # 24 hours
         return datetime.timedelta(seconds=units.parse_time_units(self.get("advanced.cluster_up_failed_interval") or "24h"))
+    
+    @property
+    def bridge_web_application(self) -> bool:
+        return self.get("advanced.bridge_web_application") or False
 
 API_VERSION = "1.13.1"
 VERSION = "4.0.16"
@@ -121,6 +125,7 @@ def cluster_up_failed_interval(self) -> datetime.timedelta: # 24 hours
     "advanced.base_url": "https://openbmclapi.bangbang93.com",
     "advanced.bd_url": "https://bd.bangbang93.com",
     "advanced.storage_measure": False,
+    "advanced.bridge_web_application": False,
     "web.port": 6543,
     "web.public_port": 6543,
     "web.proxy": False,

core/web.py

@@ -11,6 +11,7 @@
 import tianxiu2b2t.anyio.streams.proxy as streams_proxy
 from tianxiu2b2t.anyio import concurrency
 from tianxiu2b2t.utils import runtime
+from tianxiu2b2t.http.asgi import ASGIApplicationBridge
 
 from . import utils, abc
 from .logger import logger
@@ -118,7 +119,7 @@ async def pub_listener(
     )
 
     tls_listener = streams.AutoTLSListener(
-        streams_proxy.ProxyProtocolV2Listener(
+        streams_proxy.ProxyProtocolMixedListener(
             streams.FixedSocketListener(
                 listener
             ),
@@ -131,7 +132,13 @@ async def serve(
 ):
     async with listener:
         logger.tinfo("web.forward.pub_port", port=pub_port)
-        await listener.serve(pub_handler)
+        if not cfg.bridge_web_application:
+            await listener.serve(pub_handler)
+            return
+        await ASGIApplicationBridge(
+            app,
+            listener,
+        ).serve()
 
 async def pub_handler(
     sock: streams.BufferedByteStream,
@@ -253,6 +260,8 @@ async def setup(
         context.check_hostname = False
         context.hostname_checks_common_name = False
         context.verify_mode = ssl.CERT_NONE
+        if cfg.bridge_web_application:
+            context.set_alpn_protocols(["h2", "http/1.1"])
 
         for domain in cert.domains:
             tls_listener.add_context(