Mode: implement MODE=net to run both WebTransport (HTTP/3) and QUIC datagram servers concurrently via MultiTransport; add port envs WT_PORT/QUIC_PORT

run.py

@@ -73,7 +73,7 @@ if __name__ == "__main__":
     try:
         if any(a in ("-h", "--help") for a in sys.argv[1:]):
             print(
-                "Usage: python run.py [--mode mem|quic|wt] [--log-level LEVEL] [--run-seconds N]\n"
+                "Usage: python run.py [--mode mem|quic|wt|net] [--log-level LEVEL] [--run-seconds N]\n"
                 "  TLS (for wt/quic): set QUIC_CERT/QUIC_KEY or WT_CERT/WT_KEY env vars\n"
                 "  WT static server (MODE=wt): STATIC=1 [STATIC_HOST/PORT/ROOT]\n"
                 "Examples:\n  MODE=wt QUIC_CERT=cert.pem QUIC_KEY=key.pem python run.py\n  MODE=mem python run.py"
@@ -89,6 +89,28 @@ if __name__ == "__main__":
         elif mode == "quic":
             logging.info("Starting in QUIC datagram mode")
             asyncio.run(run_quic())
+        elif mode == "net":
+            logging.info("Starting in combined WebTransport+QUIC mode")
+            from server.webtransport_server import WebTransportServer
+            from server.quic_transport import QuicWebTransportServer
+            from server.multi_transport import MultiTransport
+            cfg = ServerConfig()
+            host_wt = os.environ.get("WT_HOST", os.environ.get("QUIC_HOST", "0.0.0.0"))
+            port_wt = int(os.environ.get("WT_PORT", os.environ.get("QUIC_PORT", "4433")))
+            host_quic = os.environ.get("QUIC_HOST", host_wt)
+            port_quic = int(os.environ.get("QUIC_PORT", "4443"))
+            cert = os.environ.get("WT_CERT") or os.environ.get("QUIC_CERT")
+            key = os.environ.get("WT_KEY") or os.environ.get("QUIC_KEY")
+            if not cert or not key:
+                raise SystemExit("WT/QUIC cert/key required: set WT_CERT/WT_KEY or QUIC_CERT/QUIC_KEY")
+            async def _run_net():
+                server: GameServer
+                wt = WebTransportServer(host_wt, port_wt, cert, key, lambda d, p: server.on_datagram(d, p))
+                qu = QuicWebTransportServer(host_quic, port_quic, cert, key, lambda d, p: server.on_datagram(d, p))
+                m = MultiTransport(wt, qu)
+                server = GameServer(transport=m, config=cfg)
+                await asyncio.gather(m.run(), server.tick_loop())
+            asyncio.run(_run_net())
         else:
             logging.info("Starting in in-memory transport mode")
             asyncio.run(run_in_memory())
@@ -113,3 +135,4 @@ async def _run_tasks_with_optional_timeout(tasks):
         for t in tasks:
             t.cancel()
         await asyncio.gather(*tasks, return_exceptions=True)
+

server/multi_transport.py

@@ -0,0 +1,26 @@
+from __future__ import annotations
+
+import asyncio
+from .transport import DatagramServerTransport, TransportPeer
+
+
+class MultiTransport(DatagramServerTransport):
+    """Run both WebTransport and QUIC transports and route sends.
+
+    Inbound datagrams share the same on_datagram callback from GameServer,
+    so GameServer sees a unified source of datagrams.
+    """
+
+    def __init__(self, wt_transport: DatagramServerTransport, quic_transport: DatagramServerTransport):
+        self._wt = wt_transport
+        self._quic = quic_transport
+
+    async def send(self, data: bytes, peer: TransportPeer) -> None:
+        # WebTransport peers are tuples (proto, flow_id); QUIC uses protocol instance
+        if isinstance(peer.addr, tuple) and len(peer.addr) == 2:
+            await self._wt.send(data, peer)
+        else:
+            await self._quic.send(data, peer)
+
+    async def run(self) -> None:
+        await asyncio.gather(self._wt.run(), self._quic.run())