docs: update README and AGENTS.md to reflect http.Server refactor
Some checks failed
continuous-integration/drone/push Build is failing

- Replace "Raw TCP listener" references with http.Server/hijack model
- Update architecture diagram and description
- Add testing section to AGENTS.md with test summary
- Update key patterns to match current code
- Fix file locations table (add e2e_test.go, reconstructed_conn.go)
This commit is contained in:
2026-05-03 22:43:06 -04:00
parent 7df8521478
commit 2aee0765aa
2 changed files with 30 additions and 15 deletions

View File

@@ -22,17 +22,17 @@ Go 1.25+ is required (`go.mod`). Nix devshell provides Go, gopls, golangci-lint.
## Architecture at a Glance ## Architecture at a Glance
``` ```
server/server.go — Raw TCP listener, reads Host header, routes to tunnel or control API server/server.go — net/http.Server, ServeHTTP routes by Host subdomain to tunnel or control API
tunnel/tunnel.go — Core Tunnel struct, WebSocket message loop, stream management tunnel/tunnel.go — Core Tunnel struct, WebSocket message loop, stream management
tunnel/forwarder.go — Forwarder interface; factory selects HTTP or TCP forwarder tunnel/forwarder.go — Forwarder interface; HTTP/HTTPS → HTTP forwarder, everything else → TCP
tunnel/http_forwarder.go — httputil.ReverseProxy served over net.Pipe via multiConnListener tunnel/http_forwarder.go — httputil.ReverseProxy served over net.Pipe via multiConnListener
tunnel/tcp_forwarder.go — Direct net.Dial TCP forwarding tunnel/tcp_forwarder.go — Direct net.Dial TCP forwarding
tunnel/stream.go — Stream interface (io.ReadWriteCloser + Source/Target) tunnel/stream.go — Stream interface (io.ReadWriteCloser + Source/Target)
store/store.go — In-memory request/response recorder with pub/sub (SSE) server/reconstructed_conn.go — Replays re-serialized headers + buffered body + raw conn after hijack
web/web.go — Local tunnel monitor (port 8181), SSE endpoint store/store.go In-memory request/response recorder with pub/sub (SSE)
config/config.go — Reflection-based config from struct tags → flags + env vars web/web.go — Local tunnel monitor (port 8181), SSE endpoint
pkg/maps/map.go — Generic sync.RWMutex-guarded map config/config.go — Reflection-based config from struct tags → flags + env vars
types/message.go — WebSocket message envelope (data | close) pkg/maps/map.go — Generic sync.RWMutex-guarded map
``` ```
## Code Conventions ## Code Conventions
@@ -46,9 +46,9 @@ types/message.go — WebSocket message envelope (data | close)
## Key Patterns ## Key Patterns
1. **Raw TCP HTTP upgrade**: The server reads from a raw TCP connection to inspect the Host header before deciding whether to handle as a control API request or tunnel the connection via WebSocket. 1. **ServeHTTP + Hijack for tunnel routing**: The server uses `net/http.Server` with a `ServeHTTP` handler. It inspects the `Host` header to determine routing. Control API requests are handled normally via `http.ResponseWriter`. Tunnel requests hijack the TCP connection, re-serialize the HTTP request, and forward it through the tunnel via `reconstructedConn`.
2. **Reconstructed connection**: After reading the HTTP request from the raw conn, `reconstructedConn` replays the consumed bytes so the full TCP stream can be forwarded. 2. **Reconstructed connection**: After hijack, `reconstructedConn` combines re-serialized request headers, buffered body data from the hijacked `bufio.ReadWriter`, and the raw connection into a single `io.Reader` so the tunnel client receives the complete request.
3. **Forwarder abstraction**: `Forwarder` interface decouples tunnel transport from protocol handling. HTTP forwarder uses `net.Pipe` + `multiConnListener` to feed connections into a standard `http.Server`. 3. **Forwarder abstraction**: `Forwarder` interface decouples tunnel transport from protocol handling. `NewForwarder` only uses `url.Parse` for `http://`/`https://` schemes; everything else (including parse failures like bare `host:port`) is treated as raw TCP. HTTP forwarder uses `net.Pipe` + `multiConnListener` to feed connections into a standard `http.Server`.
4. **Context-threaded records**: Request records are attached to context in `RecordRequest` and retrieved in `RecordResponse` via the `ModifyResponse` hook. 4. **Context-threaded records**: Request records are attached to context in `RecordRequest` and retrieved in `RecordResponse` via the `ModifyResponse` hook.
## Adding a New Forwarder ## Adding a New Forwarder
@@ -57,6 +57,20 @@ types/message.go — WebSocket message envelope (data | close)
2. Add a case in `tunnel.NewForwarder()` factory 2. Add a case in `tunnel.NewForwarder()` factory
3. Add corresponding `ForwarderType` const 3. Add corresponding `ForwarderType` const
## Testing
E2E tests live in `e2e_test.go` at the project root. They spin up real servers, tunnels, and targets on random ports.
```bash
# Run all tests
make tests
# Run specific test
go test -v -run TestHTTPTunnelRoundTrip -count=1 ./...
```
16 tests covering: HTTP round-trip (GET/POST), TCP echo, large bodies (1MB resp / 512KB req), response quality (headers, content-type, content-length), error paths (404, 401, duplicate name), multi-tunnel routing, concurrency, and graceful shutdown.
## File Locations ## File Locations
| Concern | Files | | Concern | Files |
@@ -69,3 +83,4 @@ types/message.go — WebSocket message envelope (data | close)
| Web UI | `web/`, `web/pages/` | | Web UI | `web/`, `web/pages/` |
| Shared types | `types/` | | Shared types | `types/` |
| Utilities | `pkg/maps/` | | Utilities | `pkg/maps/` |
| E2E tests | `e2e_test.go` |

View File

@@ -23,7 +23,7 @@ Deploy Conduit on a public server (e.g., `https://conduit.example.com`), then cr
│ tunnel │ (control + streams) │ serve │ │ tunnel │ (control + streams) │ serve │
│ (client) │ │ (public server) │ │ (client) │ │ (public server) │
├──────────────┤ ├──────────────────┤ ├──────────────┤ ├──────────────────┤
│ HTTP Fwd or │ │ Raw TCP listener │ HTTP Fwd or │ │ http.Server
│ TCP Fwd │ │ Subdomain router │ │ TCP Fwd │ │ Subdomain router │
├──────────────┤ │ WS upgrade │ ├──────────────┤ │ WS upgrade │
│ Tunnel │ └──────────────────┘ │ Tunnel │ └──────────────────┘
@@ -31,7 +31,7 @@ Deploy Conduit on a public server (e.g., `https://conduit.example.com`), then cr
└──────────────┘ └──────────────┘
``` ```
The server accepts raw TCP connections, reads the HTTP `Host` header to determine routing. Requests to the base domain hit the control API; requests to subdomains are forwarded over WebSocket to the matching tunnel client. The client then forwards traffic to the local target via either a reverse-proxy (HTTP) or direct TCP dial. The server uses `net/http.Server` to accept connections and inspects the HTTP `Host` header for routing. Requests to the base domain hit the control API; requests to subdomains are hijacked and forwarded over WebSocket to the matching tunnel client. The client then forwards traffic to the local target via either a reverse-proxy (HTTP) or direct TCP dial.
## Quick Start ## Quick Start
@@ -127,7 +127,7 @@ All options can be set via CLI flags or environment variables (`CONDUIT_` prefix
``` ```
├── cmd/ # Cobra CLI commands (root, serve, tunnel) ├── cmd/ # Cobra CLI commands (root, serve, tunnel)
├── config/ # Configuration parsing & logging setup ├── config/ # Configuration parsing & logging setup
├── server/ # TCP listener, subdomain routing, WebSocket upgrade ├── server/ # HTTP server, subdomain routing, hijack + WebSocket upgrade
├── tunnel/ # Tunnel, Stream, and Forwarder abstractions ├── tunnel/ # Tunnel, Stream, and Forwarder abstractions
├── store/ # In-memory request/response recording for the monitor ├── store/ # In-memory request/response recording for the monitor
├── web/ # Local tunnel monitor HTTP server & SSE streaming ├── web/ # Local tunnel monitor HTTP server & SSE streaming