Move NPM configuration and client behind plugin boundary
This commit is contained in:
+12
-58
@@ -79,15 +79,6 @@ def parse_endpoint_list(
|
||||
return tuple(endpoints)
|
||||
|
||||
|
||||
def endpoint_host(endpoint: Endpoint) -> str:
|
||||
parsed = urlsplit(f"//{endpoint.address}")
|
||||
if not parsed.hostname:
|
||||
raise RuntimeError(
|
||||
f"Invalid endpoint address: {endpoint.address!r}"
|
||||
)
|
||||
return parsed.hostname
|
||||
|
||||
|
||||
def env_bool(name: str, default: bool) -> bool:
|
||||
value = os.getenv(name)
|
||||
if value is None:
|
||||
@@ -97,64 +88,32 @@ def env_bool(name: str, default: bool) -> bool:
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class AppConfig:
|
||||
npm_endpoints: tuple[Endpoint, ...]
|
||||
proxy_ip: str
|
||||
proxy_api_port: int
|
||||
proxy_api_scheme: str
|
||||
target_ip: str
|
||||
proxy_verify_tls: bool
|
||||
domain_matching: bool
|
||||
domain: str | None
|
||||
include_disabled: bool = False
|
||||
|
||||
@classmethod
|
||||
def from_env(cls, include_disabled: bool = False) -> "AppConfig":
|
||||
try:
|
||||
port = int(os.getenv("PROXY_API_PORT", "81"))
|
||||
except ValueError as exc:
|
||||
raise RuntimeError("PROXY_API_PORT must be an integer") from exc
|
||||
if not 1 <= port <= 65535:
|
||||
raise RuntimeError("PROXY_API_PORT must be between 1 and 65535")
|
||||
|
||||
scheme = os.getenv("PROXY_API_SCHEME", "http").strip().lower()
|
||||
if scheme not in {"http", "https"}:
|
||||
raise RuntimeError("PROXY_API_SCHEME must be http or https")
|
||||
|
||||
raw_proxy_ip = os.getenv("PROXY_IP")
|
||||
raw_npm_endpoints = os.getenv("NPM_ENDPOINTS")
|
||||
|
||||
if raw_npm_endpoints is None:
|
||||
if not raw_proxy_ip:
|
||||
raise RuntimeError(
|
||||
"NPM_ENDPOINTS or legacy PROXY_IP is required"
|
||||
)
|
||||
proxy_ip = normalize_ipv4(raw_proxy_ip, "PROXY_IP")
|
||||
npm_endpoints = parse_endpoint_list("npm", proxy_ip, port)
|
||||
else:
|
||||
npm_endpoints = parse_endpoint_list(
|
||||
"npm",
|
||||
raw_npm_endpoints,
|
||||
port,
|
||||
)
|
||||
if raw_proxy_ip:
|
||||
proxy_ip = normalize_ipv4(raw_proxy_ip, "PROXY_IP")
|
||||
else:
|
||||
proxy_ip = endpoint_host(npm_endpoints[0])
|
||||
|
||||
raw_target_ip = os.getenv("DNS_TARGET_IP")
|
||||
raw_proxy_ip = os.getenv("PROXY_IP")
|
||||
|
||||
if raw_target_ip:
|
||||
target_ip = normalize_ipv4(raw_target_ip, "DNS_TARGET_IP")
|
||||
elif raw_proxy_ip:
|
||||
target_ip = proxy_ip
|
||||
elif len(npm_endpoints) == 1:
|
||||
target_ip = normalize_ipv4(
|
||||
endpoint_host(npm_endpoints[0]),
|
||||
raw_target_ip,
|
||||
"DNS_TARGET_IP",
|
||||
)
|
||||
elif raw_proxy_ip:
|
||||
# Deprecated compatibility fallback. Core no longer treats
|
||||
# PROXY_IP as an NPM endpoint.
|
||||
target_ip = normalize_ipv4(
|
||||
raw_proxy_ip,
|
||||
"PROXY_IP",
|
||||
)
|
||||
else:
|
||||
raise RuntimeError(
|
||||
"DNS_TARGET_IP is required when multiple NPM_ENDPOINTS "
|
||||
"are configured without legacy PROXY_IP"
|
||||
"DNS_TARGET_IP is required "
|
||||
"(legacy PROXY_IP is also accepted)"
|
||||
)
|
||||
|
||||
domain_matching = env_bool("DOMAIN_MATCHING", False)
|
||||
@@ -173,12 +132,7 @@ class AppConfig:
|
||||
)
|
||||
|
||||
return cls(
|
||||
npm_endpoints=npm_endpoints,
|
||||
proxy_ip=proxy_ip,
|
||||
proxy_api_port=port,
|
||||
proxy_api_scheme=scheme,
|
||||
target_ip=target_ip,
|
||||
proxy_verify_tls=env_bool("PROXY_VERIFY_TLS", True),
|
||||
domain_matching=domain_matching,
|
||||
domain=domain,
|
||||
include_disabled=include_disabled,
|
||||
|
||||
Reference in New Issue
Block a user