4 files changed, 73 insertions, 225 deletions

diff --git a/ttun_server/__init__.py b/ttun_server/__init__.py
index 6c77858..d54227a 100644
--- a/ttun_server/__init__.py
+++ b/ttun_server/__init__.py
@@ -2,30 +2,23 @@ import logging
 import os
 
 from fastapi import FastAPI
-from starlette.routing import Host, Route, Router, WebSocketRoute
+from starlette.routing import Host, Route, WebSocketRoute
 
-from ttun_server.endpoints import health, proxy
-from .websockets import WebsocketProxy, Tunnel
+from proxy import app as proxy_app
+from ttun_server.endpoints import health, base_endpoints
+from ttun_server.websockets import tunnel
 
 logging.basicConfig(level=getattr(logging, os.environ.get('LOG_LEVEL', 'INFO')))
 
-base_router = Router(routes=[
-    Route('/health/', health),
-    WebSocketRoute('/tunnel/', Tunnel)
-])
-
-server = FastAPI(
+app = FastAPI(
     debug=True,
     routes=[
-        Host(os.environ['TUNNEL_DOMAIN'], base_router, 'base'),
-        Route('/{path:path}', proxy),
-        WebSocketRoute('/{path:path}', WebsocketProxy)
+        WebSocketRoute('/tunnel/', endpoint=tunnel),
+        Route('/health/', endpoint=health),
+        Host(f'{{subdomain}}.{os.environ['TUNNEL_DOMAIN']}', app=proxy_app)
     ]
 )
 
-server.post()
-
-
 try:
     from ._version import version
     __version__ = version
diff --git a/ttun_server/endpoints.py b/ttun_server/endpoints.py
index 22dcb6d..51c17aa 100644
--- a/ttun_server/endpoints.py
+++ b/ttun_server/endpoints.py
@@ -1,54 +1,7 @@
-import logging
-from base64 import b64decode, b64encode
-from uuid import uuid4
+from fastapi import FastAPI
 
-from starlette.background import BackgroundTask
-from starlette.requests import Request
-from starlette.responses import Response
+base_endpoints = FastAPI()
 
-from ttun_server.proxy_queue import ProxyQueue
-from ttun_server.types import HttpRequestData, HttpMessageType, HttpMessage
-
-logger = logging.getLogger(__name__)
-
-
-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']
-        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)
+@base_endpoints.get('/health/')
+async def health():
+    return 'OK'
diff --git a/ttun_server/types.py b/ttun_server/types.py
index 8591e7d..a0c22a3 100644
--- a/ttun_server/types.py
+++ b/ttun_server/types.py
@@ -9,6 +9,7 @@ class HttpMessageType(Enum):
 
 
 class Config(TypedDict):
+    version: str
     subdomain: str
     client_version: str
 
diff --git a/ttun_server/websockets.py b/ttun_server/websockets.py
index e828b8d..ea9ae94 100644
--- a/ttun_server/websockets.py
+++ b/ttun_server/websockets.py
@@ -1,189 +1,90 @@
 import asyncio
-import json
 import logging
 import os
-import typing
-from asyncio import create_task
-from base64 import b64encode, b64decode
-from contextlib import asynccontextmanager
-from typing import Optional
 from uuid import uuid4
 
-from starlette.endpoints import WebSocketEndpoint
-from starlette.types import Scope, Receive, Send
-from starlette.websockets import WebSocket
+from fastapi import WebSocket, WebSocketDisconnect
 
 import ttun_server
 from ttun_server.proxy_queue import ProxyQueue
-from ttun_server.types import Config, Message, WebsocketMessageType, \
-    WebsocketConnectData, WebsocketMessage, WebsocketMessageData, WebsocketDisconnectData, MessageType
+from ttun_server.types import (
+    Config,
+    Message,
+    MessageType,
+)
 
 logger = logging.getLogger(__name__)
 logger.setLevel('DEBUG')
 
-class WebsocketProxy(WebSocketEndpoint):
-    encoding = 'json'
-    websocket_listen_task = None
+async def assert_compatible_version(websocket: WebSocket, config: Config) -> None:
+    client_version = config.get('version', '1.0.0')
+    logger.debug('client_version %s', client_version)
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.id = str(uuid4())
+    if 'git' not in client_version and ttun_server.__version__ != 'development':
+        [client_major, *_] = [int(i) for i in client_version.split('.')[:3]]
+        [server_major, *_] = [int(i) for i in ttun_server.__version__.split('.')]
 
-    @asynccontextmanager
-    async def proxy(self, websocket: WebSocket, message: WebsocketMessage):
-        [subdomain, *_] = websocket.url.hostname.split('.')
+        if client_major < server_major:
+            await websocket.close(4000, 'Your client is too old')
 
-        expect_ack = WebsocketMessageType(message['type']) == WebsocketMessageType.connect
+        if client_major > server_major:
+            await websocket.close(4001, 'Your client is too new')
 
-        try:
-            request_queue = await ProxyQueue.get_for_identifier(subdomain)
-            await request_queue.enqueue(message)
 
-            if expect_ack:
-                response_queue = await ProxyQueue.create_for_identifier(message["identifier"])
-                yield await response_queue.dequeue()
-                await response_queue.delete()
-            else:
-                yield
-        except AssertionError:
-            yield None
+async def tunnel(websocket: WebSocket) -> None:
+    request_tasks: dict[str, asyncio.Task] = {}
+    proxy_queues: dict[str, ProxyQueue] = {}
 
-    async def listen_for_messages(self, websocket: WebSocket):
-        response_queue = await ProxyQueue.create_for_identifier(self.id)
+    await websocket.accept()
+    config: Config = await websocket.receive_json()
 
-        while True:
-            message: WebsocketMessage = await response_queue.dequeue()
-            logger.debug(message)
-            await websocket.send_text(b64decode(message['payload']['body'].encode()).decode())
-
-    async def on_connect(self, websocket: WebSocket) -> None:
-        message = WebsocketMessage(
-            type=WebsocketMessageType.connect.value,
-            identifier=self.id,
-            payload=WebsocketConnectData(
-                path=websocket.path_params['path'],
-                headers=[
-                    (k.decode(), v.decode())
-                    for k, v
-                    in websocket.scope['headers']
-                ],
-            )
-        )
+    await assert_compatible_version(websocket, config)
 
-        async with self.proxy(websocket, message) as m:
-            if m is not None and WebsocketMessageType(m['type']) == WebsocketMessageType.ack:
+    if 'subdomains' not in config:
+        config['subdomains'] = [config['subdomain']]