WIPv3

5 files changed, 550 insertions, 68 deletions

diff --git a/.gitignore b/.gitignore
index a6d8f21..a9d7b09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -235,3 +235,5 @@ dmypy.json
 cython_debug/
 
 # End of https://www.toptal.com/developers/gitignore/api/python,pycharm+all
+
+.DS_Store
diff --git a/pyproject.toml b/pyproject.toml
index a3c3c03..70f2683 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@ name = "ttun-server"
 version = "0.1.0"
 requires-python = ">=3.14"
 dependencies = [
-    "starlette~=1.0.0",
-    "uvicorn[standard]~=0.44.0",
+    "fastapi[standard]>=0.138.2",
     "redis[hiredis]~=7.4.0",
+    "uvicorn[standard]~=0.44.0",
 ]
diff --git a/ttun_server/__init__.py b/ttun_server/__init__.py
index 2f8fed0..6c77858 100644
--- a/ttun_server/__init__.py
+++ b/ttun_server/__init__.py
@@ -1,28 +1,31 @@
 import logging
 import os
 
-from starlette.applications import Starlette
-from starlette.routing import Route, WebSocketRoute, Host, Router
+from fastapi import FastAPI
+from starlette.routing import Host, Route, Router, WebSocketRoute
 
-from ttun_server.endpoints import Proxy, Health
+from ttun_server.endpoints import health, proxy
 from .websockets import WebsocketProxy, Tunnel
 
 logging.basicConfig(level=getattr(logging, os.environ.get('LOG_LEVEL', 'INFO')))
 
 base_router = Router(routes=[
-    Route('/health/', Health),
+    Route('/health/', health),
     WebSocketRoute('/tunnel/', Tunnel)
 ])
 
-server = Starlette(
+server = FastAPI(
     debug=True,
     routes=[
         Host(os.environ['TUNNEL_DOMAIN'], base_router, 'base'),
-        Route('/{path:path}', Proxy),
+        Route('/{path:path}', proxy),
         WebSocketRoute('/{path:path}', WebsocketProxy)
     ]
 )
 
+server.post()
+
+
 try:
     from ._version import version
     __version__ = version
diff --git a/ttun_server/endpoints.py b/ttun_server/endpoints.py
index fa5e7e7..22dcb6d 100644
--- a/ttun_server/endpoints.py
+++ b/ttun_server/endpoints.py
@@ -2,7 +2,7 @@ import logging
 from base64 import b64decode, b64encode
 from uuid import uuid4
 
-from starlette.endpoints import HTTPEndpoint
+from starlette.background import BackgroundTask
 from starlette.requests import Request
 from starlette.responses import Response
 
@@ -12,62 +12,43 @@ from ttun_server.types import HttpRequestData, HttpMessageType, HttpMessage
 logger = logging.getLogger(__name__)
 
 
-class HeaderMapping:
-    def __init__(self, headers: list[tuple[str, str]]):
-        self._headers = headers
-
-    def items(self):
-        for header in self._headers:
-            yield header
-
-
-class Proxy(HTTPEndpoint):
-    async def dispatch(self) -> None:
-        request = Request(self.scope, self.receive)
-
-        [subdomain, *_] = request.headers['host'].split('.')
-        response = Response(content='Not Found', status_code=404)
-
-        identifier = str(uuid4())
-        response_queue = await ProxyQueue.create_for_identifier(identifier)
-
-        try:
-
-            request_queue = await ProxyQueue.get_for_identifier(subdomain)
-
-            logger.debug('PROXY %s%s ', subdomain, request.url)
-            await request_queue.enqueue(
-                HttpMessage(
-                    type=HttpMessageType.request.value,
-                    identifier=identifier,
-                    payload=
-                    HttpRequestData(
-                        method=request.method,
-                        path=str(request.url).replace(str(request.base_url), '/'),
-                        headers=list(request.headers.items()),
-                        body=b64encode(await request.body()).decode()
-                    )
+async def proxy(request: Request) -> Response:
+    [subdomain, *_] = request.headers['host'].split('.')
+    identifier = str(uuid4())
+    response_queue = await ProxyQueue.create_for_identifier(identifier)
+
+    try:
+        request_queue = await ProxyQueue.get_for_identifier(subdomain)
+
+        logger.debug('PROXY %s%s ', subdomain, request.url)
+        await request_queue.enqueue(
+            HttpMessage(
+                type=HttpMessageType.request.value,
+                identifier=identifier,
+                payload=HttpRequestData(
+                    method=request.method,
+                    path=str(request.url).replace(str(request.base_url), '/'),
+                    headers=list(request.headers.items()),
+                    body=b64encode(await request.body()).decode()
                 )
             )
-
-            _response = await response_queue.dequeue()
-            payload = _response['payload']
-            response = Response(
-                status_code=payload['status'],
-                headers=HeaderMapping(payload['headers']),
-                content=b64decode(payload['body'].encode())
-            )
-        except AssertionError:
-            pass
-        finally:
-            await response(self.scope, self.receive, self.send)
-            await response_queue.delete()
-
-
-class Health(HTTPEndpoint):
-    async def get(self, _) -> None:
-        response = Response(content='OK', status_code=200)
-
-        await response(self.scope, self.receive, self.send)
-
-
+        )
+
+        _response = await response_queue.dequeue()
+        payload = _response['payload']
+        return Response(
+            status_code=payload['status'],
+            headers=dict(payload['headers']),
+            content=b64decode(payload['body'].encode()),
+            background=BackgroundTask(response_queue.delete)
+        )
+    except AssertionError:
+        return Response(
+            content='Not Found',
+            status_code=404,
+            background=BackgroundTask(response_queue.delete)
+        )
+
+
+async def health(_: Request) -> Response:
+    return Response(content='OK', status_code=200)
diff --git a/uv.lock b/uv.lock
index 8f15545..5688a0b 100644
--- a/uv.lock
+++ b/uv.lock
@@ -3,6 +3,24 @@ revision = 3
 requires-python = ">=3.14"
 
 [[package]]
+name = "annotated-doc"
+version = "0.0.4"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/57/ba/046ceea27344560984e26a590f90bc7f4a75b06701f653222458922b558c/annotated_doc-0.0.4.tar.gz", hash = "sha256:fbcda96e87e9c92ad167c2e53839e57503ecfda18804ea28102353485033faa4", size = 7288, upload-time = "2025-11-10T22:07:42.062Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/1e/d3/26bf1008eb3d2daa8ef4cacc7f3bfdc11818d111f7e2d0201bc6e3b49d45/annotated_doc-0.0.4-py3-none-any.whl", hash = "sha256:571ac1dc6991c450b25a9c2d84a3705e2ae7a53467b5d111c24fa8baabbed320", size = 5303, upload-time = "2025-11-10T22:07:40.673Z" },
+]
+
+[[package]]
+name = "annotated-types"
+version = "0.7.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/ee/67/531ea369ba64dcff5ec9c3402f9f51bf748cec26dde048a2f973a4eea7f5/annotated_types-0.7.0.tar.gz", hash = "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89", size = 16081, upload-time = "2024-05-20T21:33:25.928Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/78/b6/6307fbef88d9b5ee7421e68d78a9f162e0da4900bc5f5793f6d3d0e34fb8/annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53", size = 13643, upload-time = "2024-05-20T21:33:24.1Z" },
+]
+
+[[package]]
 name = "anyio"
 version = "4.13.0"
 source = { registry = "https://pypi.org/simple" }
@@ -15,6 +33,15 @@ wheels = [
 ]
 
 [[package]]
+name = "certifi"
+version = "2026.6.17"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/c9/c7/424b75da314c1045981bd9777432fad05a9e0c69daa4ed7e308bbaffe405/certifi-2026.6.17.tar.gz", hash = "sha256:024c88eeec92ca068db80f02b8b07c9cef7b9fe261d1d535abfd5abd6f6af432", size = 134594, upload-time = "2026-06-17T10:31:07.894Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ef/2f/c5464532e965badff2f4c4c1a3a83f5697f0d7c407ed0cda44aaa99bb451/certifi-2026.6.17-py3-none-any.whl", hash = "sha256:2227dcbaafe0d2f59279d1762ddddc37783ed4354594f194ffc31d20f41fc3db", size = 133289, upload-time = "2026-06-17T10:31:06.348Z" },
+]
+
+[[package]]
 name = "click"
 version = "8.3.2"
 source = { registry = "https://pypi.org/simple" }
@@ -36,6 +63,146 @@ wheels = [
 ]
 
 [[package]]
+name = "detect-installer"
+version = "0.1.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/5f/ce/6897d812825e9d4c53e3c7112726e800cc5231b013b2223bf64f653ff362/detect_installer-0.1.0.tar.gz", hash = "sha256:00ad7ba0a36e3cf7d08a40d3643011746dbc112597c7d475cc91c416710ca4e7", size = 3049, upload-time = "2026-02-23T10:40:22.567Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/cc/34/8cc73273414405086c58852916e4031812a6a30fe04c057e37ad99397b7f/detect_installer-0.1.0-py3-none-any.whl", hash = "sha256:034fb20fd665c36e6ba52b8821525ea07fb4f7f938cac459df889fb33801528a", size = 4539, upload-time = "2026-02-23T10:40:23.807Z" },
+]
+
+[[package]]
+name = "dnspython"
+version = "2.8.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/8c/8b/57666417c0f90f08bcafa776861060426765fdb422eb10212086fb811d26/dnspython-2.8