v0.7.0

.gitea/workflows/build.yml

@@ -54,11 +54,11 @@ jobs:
             echo "${{ secrets.ACCESS_TOKEN }}" | docker login git.uvpn.shop -u ${{ gitea.repository_owner }} --password-stdin
             
             # Скачиваем свежий образ
-            docker pull git.uvpn.shop/uvpn/backend:latest
+            docker compose pull
             
             # Перезапускаем контейнер с новым образом
-            docker-compose down || true   # Если контейнер не запущен — игнорируем ошибку
+            docker compose down || true   # Если контейнер не запущен — игнорируем ошибку
-            docker-compose up -d
+            docker compose up -d
             
             # Очищаем неиспользуемые образы
             docker image prune -f

main.py

@@ -2,7 +2,7 @@ from fastapi import FastAPI
 import tomllib
 import logging
 
-from routers import ip, tariffs, nodes
+from routers import hosts, ip, tariffs
 
 logging.basicConfig(level=logging.INFO)
 
@@ -23,4 +23,4 @@ async def health_check():
 
 app.include_router(ip.router)
 app.include_router(tariffs.router)
-app.include_router(nodes.router)
+app.include_router(hosts.router)

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uvpn-backend"
-version = "0.6.0"
+version = "0.7.0"
 description = "FastAPI backend with Docker for uvpn.shop"
 readme = "README.md"
 requires-python = ">=3.12"

routers/hosts.py

@@ -6,11 +6,19 @@ from remnawave.models.hosts import GetAllHostsResponseDto
 
 logging.basicConfig(level=logging.INFO)
 
-router = APIRouter(prefix='/api/v1', tags=['nodes'])
+router = APIRouter(prefix='/api/v1', tags=['hosts'])
 remnawave = RemnawaveSDK(base_url='http://remnawave:3000', token=getenv('REMNAWAVE_API_TOKEN'))
 
-@router.get('/nodes')
+@router.get('/hosts')
 async def get_nodes():
     hosts: GetAllHostsResponseDto = await remnawave.hosts.get_all_hosts()
+    return [
 
-    return hosts.root
+        {
+            'name': host.remark,
+            'address': host.address,
+            'port': host.port
+        }
+
+        for host in hosts.root if not host.is_disabled and not host.is_hidden
+    ]