benya/tg-admin-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Normalize NPMplus base_url to /api

Browse Source
This commit is contained in:
Alex
2026-02-08 02:28:41 +03:00
parent 054d1d0d50
commit e1b0f1153e
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/npmplus.py
View File

@@ -55,9 +55,19 @@ def _request_json(
return json.loads(payload) return json.loads(payload)
def _api_base(cfg: dict[str, Any]) -> str:
npm_cfg = cfg.get("npmplus", {})
base = (npm_cfg.get("base_url") or "").rstrip("/")
if not base:
return ""
if not base.endswith("/api"):
base = f"{base}/api"
return base
def _get_token(cfg: dict[str, Any]) -> str: def _get_token(cfg: dict[str, Any]) -> str:
npm_cfg = cfg.get("npmplus", {}) npm_cfg = cfg.get("npmplus", {})
base_url = (npm_cfg.get("base_url") or "").rstrip("/") base_url = _api_base(cfg)
identity = npm_cfg.get("identity") identity = npm_cfg.get("identity")
secret = npm_cfg.get("secret") secret = npm_cfg.get("secret")
static_token = npm_cfg.get("token") static_token = npm_cfg.get("token")
@@ -113,7 +123,7 @@ def _get_token(cfg: dict[str, Any]) -> str:
def fetch_certificates(cfg: dict[str, Any]) -> list[dict[str, Any]]: def fetch_certificates(cfg: dict[str, Any]) -> list[dict[str, Any]]:
npm_cfg = cfg.get("npmplus", {}) npm_cfg = cfg.get("npmplus", {})
base_url = (npm_cfg.get("base_url") or "").rstrip("/") base_url = _api_base(cfg)
verify_tls = npm_cfg.get("verify_tls", True) verify_tls = npm_cfg.get("verify_tls", True)
if not base_url: if not base_url:
@@ -134,7 +144,7 @@ def fetch_certificates(cfg: dict[str, Any]) -> list[dict[str, Any]]:
def list_proxy_hosts(cfg: dict[str, Any]) -> list[dict[str, Any]]: def list_proxy_hosts(cfg: dict[str, Any]) -> list[dict[str, Any]]:
npm_cfg = cfg.get("npmplus", {}) npm_cfg = cfg.get("npmplus", {})
base_url = (npm_cfg.get("base_url") or "").rstrip("/") base_url = _api_base(cfg)
verify_tls = npm_cfg.get("verify_tls", True) verify_tls = npm_cfg.get("verify_tls", True)
if not base_url: if not base_url:
raise ValueError("NPMplus base_url not configured") raise ValueError("NPMplus base_url not configured")
@@ -153,7 +163,7 @@ def list_proxy_hosts(cfg: dict[str, Any]) -> list[dict[str, Any]]:
def set_proxy_host(cfg: dict[str, Any], host_id: int, enabled: bool) -> tuple[bool, str]: def set_proxy_host(cfg: dict[str, Any], host_id: int, enabled: bool) -> tuple[bool, str]:
npm_cfg = cfg.get("npmplus", {}) npm_cfg = cfg.get("npmplus", {})
base_url = (npm_cfg.get("base_url") or "").rstrip("/") base_url = _api_base(cfg)
verify_tls = npm_cfg.get("verify_tls", True) verify_tls = npm_cfg.get("verify_tls", True)
if not base_url: if not base_url:
return False, "NPMplus base_url not configured" return False, "NPMplus base_url not configured"