Commit Graph

48 Commits

Author SHA1 Message Date
user
b72d083f56 feat: wire control API into server and config
Add api_host/api_port to Config dataclass, parse api_listen key in
load_config(), add --api [HOST:]PORT CLI flag. Start/stop API server
in serve() alongside the SOCKS5 listener.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-16 19:03:44 +01:00
user
ecf9a840e4 feat: add control API module
Lightweight asyncio HTTP handler for runtime inspection and management.
Endpoints: /status, /metrics, /pool, /pool/alive, /config (GET) and
/reload, /pool/test, /pool/refresh (POST). Raw HTTP/1.1 parsing, JSON
responses, no new dependencies.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-16 19:02:43 +01:00
user
66fc76ceb3 merge: codebase consolidation and startup fixes
11 commits: deduplicate constants/parsing, consolidate health-check
logic, remove legacy ProxySource layer, instant warm start, early
signal handler registration, k8s-file logging driver.

60 tests passing, ruff clean, zero behavior changes.
2026-02-15 22:24:35 +01:00
user
a1fc19fb45 docs: update for codebase consolidation and startup fixes
- Remove source.py from architecture (deleted)
- Add metrics.py to module list
- Update warm start: trusts cached state, instant startup
- Update signal handling: registered before startup
- Add refactoring tasks to TASKS.md
- Remove stale troubleshooting entry

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 22:20:17 +01:00
user
4ae40fe0a1 feat: use k8s-file logging driver with 10MB rotation
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 22:14:23 +01:00
user
6881c7d862 fix: register signal handlers before pool startup
Move SIGTERM/SIGINT handler registration to the top of serve()
so signals are never ignored during slow startup phases (cold
start health tests, source fetching). Previously, signals sent
before pool.start() returned had no handler, causing podman to
escalate to SIGKILL after the stop timeout.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 22:09:12 +01:00
user
590126bcf8 fix: defer health tests on warm start for instant startup
On warm start, trust persisted alive state and serve immediately.
Health tests run in background. Cold start behavior unchanged.

Previously warm start blocked on testing all cached-alive proxies
before binding the listen port, causing multi-minute delays when
the chain or proxies were slow to respond.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 22:01:18 +01:00
user
5418b30441 test: add tests for extracted parse_api_proxies
Cover valid entries, invalid proto/port, missing keys, and
mixed valid/invalid input.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 21:51:55 +01:00
user
6d9a4a2503 refactor: remove legacy ProxySource layer
Delete source.py, ProxySourceConfig, and Config.proxy_source.
ProxyPool fully supersedes ProxySource. The YAML backward-compat
conversion in load_config is preserved so old configs still work.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 21:51:21 +01:00
user
a99b318bfb refactor: rename ambiguous variables in config loader
pp -> pool_raw, ps -> src_raw for clarity.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 21:49:44 +01:00
user
2864ee6743 refactor: replace ensure_future with create_task
Use the modern asyncio.create_task() in pool.py and server.py.
Replace redundant list comprehension with list() in evict_keys copy.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 21:49:13 +01:00
user
18789bbc63 refactor: remove threading from metrics
The server is pure asyncio (single-threaded). The threading.Lock
was never contended. Use a float accumulator in _human_bytes to
avoid the int-to-float type: ignore.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 21:48:47 +01:00
user
210d3539f1 refactor: consolidate health-check HTTP logic in pool
Extract _http_check() to deduplicate identical HTTP GET + status
parsing between _test_proxy and _test_chain.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 21:48:22 +01:00
user
4582f54b5b refactor: extract shared proxy parsing and constants
Move VALID_PROTOS to config.py as single source of truth.
Add parse_api_proxies() to eliminate duplicate API response
parsing in pool.py and source.py.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 21:47:46 +01:00
user
40560ef6dd docs: document connection limit, async fetch, and connection pool
Update USAGE, CHEATSHEET, README, PROJECT, and TASKS for the three
performance improvements: max_connections semaphore, async HTTP
source fetching, and first-hop TCP connection pool.
2026-02-15 17:56:08 +01:00
user
248f5c3306 feat: pre-warmed TCP connection pool to first hop
Add FirstHopPool that maintains a deque of pre-established TCP
connections to chain[0]. Connections idle beyond pool_max_idle are
evicted; a background task refills to pool_size. build_chain() tries
the pool first, falls back to open_connection. Enabled with
pool_size > 0 in config. Only pools the TCP handshake -- SOCKS/HTTP
tunnels are consumed, not returned.
2026-02-15 17:56:03 +01:00
user
903cb38b9f feat: async HTTP client and parallel source fetching
Replace blocking urllib with a minimal async HTTP/1.1 client (http.py)
using asyncio streams. Pool source fetches now run in parallel via
asyncio.gather. Dead proxy reporting uses async POST. Handles
Content-Length, chunked transfer-encoding, and connection-close bodies.
No new dependencies.
2026-02-15 17:55:56 +01:00
user
714e8efb3d feat: cap concurrent connections with semaphore
Add max_connections config (default 256) with -m/--max-connections CLI
flag. Server wraps on_client in asyncio.Semaphore to prevent fd
exhaustion under load. Value reloads on SIGHUP; active connections
drain normally. Also adds pool_size/pool_max_idle config fields and
first_hop_pool wiring in server.py (used by next commits), and fixes
asyncio.TimeoutError -> TimeoutError lint warnings.
2026-02-15 17:55:50 +01:00
user
076213a830 docs: document data volume mount and container profiling
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 17:05:51 +01:00
user
11b2bdcb4f chore: disable cProfile in compose by default
Keep the command as a comment for easy re-enable when needed.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 17:04:59 +01:00
user
de7a5906ae chore: add data volume and cProfile to compose
Mount ~/.cache/s5p as /data for pool state and profile output.
Enable cProfile by default, dumping to /data/s5p.prof.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 17:02:10 +01:00
user
d6f3850614 fix: set root logger handler level on SIGHUP log_level reload
basicConfig creates a StreamHandler with its own level filter.
Changing only the logger levels left the handler filtering at the
original level, so debug messages were silently dropped after reload.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 16:26:32 +01:00
user
a5e634e406 docs: update project docs for SIGHUP reload and dead proxy reporting
Add hot reload section to USAGE with reloadable settings table.
Add dead proxy reporting section with report_url config and payload
format. Update example.yaml, ROADMAP, TASKS, TODO, CHEATSHEET.
2026-02-15 16:05:39 +01:00
user
650db64d70 feat: add dead proxy reporting to source API
When report_url is configured, POST evicted proxy list as JSON after
each health test cycle. Fire-and-forget: failures are logged at debug
level. Payload format: {"dead": [{"proto": "socks5", "proxy": "host:port"}]}.
2026-02-15 16:04:19 +01:00
user
818169758b feat: add SIGHUP hot config reload
On SIGHUP, re-read the YAML config file and update mutable runtime
settings: timeout, retries, log_level, and pool config (sources,
intervals, thresholds). Pool triggers an immediate source re-fetch.
Listen address and chain require restart.
2026-02-15 16:02:57 +01:00
user
fc1dea70f4 docs: update project docs for warm start and chain health check
Add warm start and chain pre-flight sections to USAGE. Mark both
features complete in ROADMAP and TASKS. Remove implemented items
from TODO. Update README, PROJECT, and CHEATSHEET.
2026-02-15 16:00:23 +01:00
user
0816a7f0cb feat: add static chain health check before pool tests
Test the static chain (without pool proxy) before running pool health
tests. If the chain itself is unreachable, skip proxy testing and log a
clear warning. Prevents false mass-failure when the issue is upstream
(e.g., Tor is down), not the exit proxies.
2026-02-15 15:59:26 +01:00
user
8e2d6a654a feat: add fast warm start with deferred full health test
On warm start (state has alive proxies), only quick-test the
previously-alive subset before serving. Full health test runs in
background. Cold start behavior unchanged (test all before serving).
Reduces startup blocking from minutes to seconds on warm restarts.
2026-02-15 15:58:22 +01:00
user
eddcc5f615 docs: update project docs for backoff, stale expiry, pool metrics
Add failure backoff and stale expiry sections to USAGE. Document pool=
field in metrics output. Update ROADMAP, TASKS, TODO with completed
items and remaining suggestions. Add metrics example to CHEATSHEET.
2026-02-15 15:56:06 +01:00
user
8aa384a80b feat: add pool stats to periodic metrics log
Append pool=alive/total to the 60-second metrics summary and shutdown
log. Pool health is now visible without waiting for health test cycles.
2026-02-15 15:54:52 +01:00
user
e1403a67fc feat: add stale proxy expiry based on last_seen TTL
Evict proxies not returned by sources for >3 refresh cycles and not
currently alive. Cleans up proxies removed upstream faster than waiting
for max_fails consecutive health test failures.
2026-02-15 15:54:17 +01:00
user
4801e70b93 feat: add per-proxy backoff after connection failure
Track last_fail timestamp on ProxyEntry. When a connection attempt fails
in server.py, report_failure() records the time. The selection weight
multiplies by min(fail_age/60, 1.0), ramping back from floor over 60s.
Prevents wasting retries on proxies that just failed.
2026-02-15 15:53:39 +01:00
user
0ed9142b1a docs: update project docs for weighted proxy selection
Add selection weight section to USAGE.md with decay formula and
reference table. Mark feature complete in ROADMAP and TASKS.
Update README and PROJECT descriptions.
2026-02-15 15:49:54 +01:00
user
b60264b865 feat: add weighted proxy selection based on recency
Replace uniform random.choice with random.choices weighted by last_ok
recency. Proxies tested successfully more recently get higher selection
probability (weight = 1/(1 + age/300)), decaying over ~5 minutes.
2026-02-15 15:48:40 +01:00
user
b11071e7f7 docs: add proxy pool documentation
Update all docs for managed proxy pool: README, USAGE, CHEATSHEET,
PROJECT, TASKS, and example config. Document multi-source config,
proxy file format, health testing, persistence, and legacy compat.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 06:18:20 +01:00
user
72adf2f658 feat: add managed proxy pool with health testing
ProxyPool replaces ProxySource with:
- Multiple sources: HTTP APIs and text files (one proxy URL per line)
- Deduplication by proto://host:port
- Health testing: full chain test with configurable concurrency
- Mass-failure guard: skip eviction when >90% fail
- Background loops for periodic refresh and health checks
- JSON state persistence with atomic writes (warm starts)
- Backward compat: ProxySource still works for legacy configs

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 06:11:19 +01:00
user
1780c3a8cd feat: add proxy pool config dataclasses
Add PoolSourceConfig and ProxyPoolConfig for multi-source proxy pool
with health testing. Config supports both HTTP API and file sources.

Backward compat: legacy proxy_source YAML key auto-converts to
proxy_pool. CLI -S flag creates ProxyPoolConfig with single source.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 06:08:39 +01:00
user
4463adf08b refactor: extract build_chain into proto module
Moves _negotiate_hop() and build_chain() from server.py to proto.py
to break circular import between server and the upcoming pool module.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 06:07:31 +01:00
user
b07ea49965 feat: add connection retry and metrics
Retry failed proxy connections with a fresh random proxy on each
attempt (configurable via retries setting, proxy_source only).
Track connection metrics and log summary every 60s and on shutdown.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-15 04:54:13 +01:00
user
9b18a59df9 docs: add proxy source API documentation 2026-02-15 04:20:17 +01:00
user
ddad839fca feat: add dynamic proxy source API integration
Fetches proxies from an HTTP API, caches them in memory, and appends
a random proxy to the chain on each connection. Supports proto/country
filters and configurable refresh interval.

Config: proxy_source.url, proto, country, limit, refresh
CLI: -S/--proxy-source URL
2026-02-15 04:19:29 +01:00
user
20c7597ef9 docs: update all docs for container, cprofile, and config split 2026-02-15 03:51:16 +01:00
user
a40c35cc0b fix: add STOPSIGNAL SIGTERM to Containerfile 2026-02-15 03:46:51 +01:00
user
c016844a33 fix: handle SIGTERM gracefully for clean container shutdown
Register signal handler on the event loop to stop the server
on SIGTERM/SIGINT instead of relying on serve_forever().
2026-02-15 03:46:18 +01:00
user
61c580a555 feat: add Containerfile and compose.yaml for podman
Alpine-based image (59MB), source and config bind-mounted via
compose.yaml. Host networking for access to local Tor nodes.
2026-02-15 03:42:59 +01:00
user
57d2d87424 feat: add --cprofile flag for performance profiling
Dumps cProfile stats to a file (default: s5p.prof) on exit.
View with: python -m pstats s5p.prof
2026-02-15 03:39:36 +01:00
user
57c78f5563 feat: split config into tracked example and gitignored live config
config/example.yaml is the repo-safe sample.
config/s5p.yaml holds real proxy addresses and is gitignored.
2026-02-15 03:38:04 +01:00
user
0710dda8da feat: initial SOCKS5 proxy with chain support
Asyncio-based SOCKS5 server that tunnels connections through
configurable chains of SOCKS5, SOCKS4/4a, and HTTP CONNECT proxies.
Tor integration via standard SOCKS5 hop.
2026-02-15 03:10:25 +01:00