v0.7.0

.gitea/workflows/build.yml

@@ -1,18 +1,21 @@
-name: Build and Push Docker Image
+name: Build and Deploy Backend
 
 on:
   push:
-    branches: [ "master" ] # Запускать при пуше в эти ветки
+    tags:
+      - '*'
+  workflow_dispatch:
 
 jobs:
-  build-and-push:
+  build-and-deploy:
     runs-on: ubuntu-latest
+    
     steps:
-      # 1. Клонируем ваш репозиторий
+      # 1. Клонируем код
       - name: Checkout code
         uses: actions/checkout@v4
 
-      # 2. Настраиваем Docker Buildx для сборки
+      # 2. Настраиваем Docker Buildx
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -22,7 +25,7 @@ jobs:
         with:
           registry: git.uvpn.shop
           username: ${{ gitea.repository_owner }}
-          password: ${{ secrets.ACCESS_TOKEN }} # Используем ваш секрет
+          password: ${{ secrets.ACCESS_TOKEN }}
 
       # 4. Собираем и пушим образ
       - name: Build and push Docker image
@@ -32,4 +35,31 @@ jobs:
           push: true
           tags: |
             git.uvpn.shop/uvpn/backend:latest
-            git.uvpn.shop/uvpn/backend:${{ gitea.sha }} # Полезно для версионирования
+            git.uvpn.shop/uvpn/backend:${{ gitea.sha }}
+
+      # 5. Устанавливаем SSH-ключ для деплоя
+      - name: Install SSH key
+        uses: webfactory/ssh-agent@v0.9.0
+        with:
+          ssh-private-key: ${{ secrets.DEPLOY_SSH_KEY }}
+
+      # 6. Деплой на сервер
+      - name: Deploy on server
+        run: |
+          ssh -o StrictHostKeyChecking=no ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }} << 'EOF'
+            # Переходим в папку с проектом (где лежит docker-compose.yml)
+            cd /opt/uvpn.shop/backend
+            
+            # Логинимся в реестр Gitea (чтобы docker pull мог скачать образ)
+            echo "${{ secrets.ACCESS_TOKEN }}" | docker login git.uvpn.shop -u ${{ gitea.repository_owner }} --password-stdin
+            
+            # Скачиваем свежий образ
+            docker compose pull
+            
+            # Перезапускаем контейнер с новым образом
+            docker compose down || true   # Если контейнер не запущен — игнорируем ошибку
+            docker compose up -d
+            
+            # Очищаем неиспользуемые образы
+            docker image prune -f
+          EOF

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.5.0"
+version = "0.7.0"
 description = "FastAPI backend with Docker for uvpn.shop"
 readme = "README.md"
 requires-python = ">=3.12"

routers/hosts.py

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

routers/nodes.py

@@ -1,27 +0,0 @@
-from fastapi import APIRouter
-import logging
-from os import getenv
-from remnawave import RemnawaveSDK
-from remnawave.models.nodes import GetAllNodesResponseDto
-
-logging.basicConfig(level=logging.INFO)
-
-router = APIRouter(prefix='/api/v1', tags=['nodes'])
-remnawave = RemnawaveSDK(base_url='http://remnawave:3000', token=getenv('REMNAWAVE_API_TOKEN'))
-
-@router.get('/nodes')
-async def get_nodes():
-    nodes: GetAllNodesResponseDto = await remnawave.nodes.get_all_nodes()
-    return [
-        {
-            'ip': node.address,
-            'port': node.port,
-            'uptime': node.xray_uptime,
-            'users_online': node.users_online,
-            'name': node.name,
-            'country_code': node.country_code
-        }
-
-        for node in nodes if node.is_connected
-    ]
-