Add NPMplus proxy hosts controls
This commit is contained in:
@@ -10,7 +10,7 @@ from services.http_checks import get_url_checks, check_url
|
||||
from services.queue import enqueue
|
||||
from services.updates import list_updates, apply_updates
|
||||
from services.runner import run_cmd
|
||||
from services.npmplus import fetch_certificates, format_certificates
|
||||
from services.npmplus import fetch_certificates, format_certificates, list_proxy_hosts, set_proxy_host
|
||||
import state
|
||||
from state import UPDATES_CACHE, REBOOT_PENDING
|
||||
from services.metrics import summarize
|
||||
@@ -246,6 +246,49 @@ async def ssl_certs(msg: Message):
|
||||
asyncio.create_task(worker())
|
||||
|
||||
|
||||
@dp.message(F.text == "🧩 NPMplus")
|
||||
async def npmplus_hosts(msg: Message):
|
||||
if not is_admin_msg(msg):
|
||||
return
|
||||
|
||||
await msg.answer("⏳ Loading NPMplus hosts…", reply_markup=system_logs_kb)
|
||||
|
||||
async def worker():
|
||||
try:
|
||||
hosts = await asyncio.to_thread(list_proxy_hosts, cfg)
|
||||
except Exception as e:
|
||||
await msg.answer(f"⚠️ NPMplus error: {e}", reply_markup=system_logs_kb)
|
||||
return
|
||||
|
||||
if not hosts:
|
||||
await msg.answer("🧩 NPMplus\n\n(no proxy hosts)", reply_markup=system_logs_kb)
|
||||
return
|
||||
|
||||
lines = ["🧩 NPMplus proxy hosts\n"]
|
||||
rows = []
|
||||
for h in hosts[:10]:
|
||||
hid = h.get("id")
|
||||
domains = h.get("domain_names") or []
|
||||
name = ", ".join(domains) if isinstance(domains, list) else str(domains)
|
||||
forward = f"{h.get('forward_host')}:{h.get('forward_port')}"
|
||||
enabled = h.get("enabled", True)
|
||||
icon = "🟢" if enabled else "🔴"
|
||||
lines.append(f"{icon} {name} → {forward}")
|
||||
if hid is not None:
|
||||
action = "disable" if enabled else "enable"
|
||||
rows.append([
|
||||
InlineKeyboardButton(
|
||||
text=f\"{('⛔' if enabled else '✅')} {name[:12]}\",
|
||||
callback_data=f\"npmplus:{action}:{hid}\"
|
||||
)
|
||||
])
|
||||
|
||||
kb = InlineKeyboardMarkup(inline_keyboard=rows)
|
||||
await msg.answer("\n".join(lines), reply_markup=kb)
|
||||
|
||||
asyncio.create_task(worker())
|
||||
|
||||
|
||||
@dp.message(F.text == "📦 Updates")
|
||||
async def updates_list(msg: Message):
|
||||
if not is_admin_msg(msg):
|
||||
@@ -381,6 +424,30 @@ async def reboot_cancel(cb: CallbackQuery):
|
||||
await cb.message.delete()
|
||||
|
||||
|
||||
@dp.callback_query(F.data.startswith("npmplus:"))
|
||||
async def npmplus_toggle(cb: CallbackQuery):
|
||||
if cb.from_user.id != cfg["telegram"]["admin_id"]:
|
||||
return
|
||||
parts = cb.data.split(":")
|
||||
if len(parts) != 3:
|
||||
await cb.answer("Bad request")
|
||||
return
|
||||
action, raw_id = parts[1], parts[2]
|
||||
try:
|
||||
host_id = int(raw_id)
|
||||
except ValueError:
|
||||
await cb.answer("Bad id")
|
||||
return
|
||||
|
||||
enable = action == "enable"
|
||||
await cb.answer("Working…")
|
||||
ok, info = await asyncio.to_thread(set_proxy_host, cfg, host_id, enable)
|
||||
if ok:
|
||||
await cb.message.answer("✅ Updated", reply_markup=system_logs_kb)
|
||||
else:
|
||||
await cb.message.answer(f"❌ NPMplus error: {info}", reply_markup=system_logs_kb)
|
||||
|
||||
|
||||
@dp.message(F.text, F.func(lambda msg: msg.from_user and msg.from_user.id in REBOOT_PENDING))
|
||||
async def reboot_password(msg: Message):
|
||||
if not is_admin_msg(msg):
|
||||
|
||||
Reference in New Issue
Block a user