Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d9de5a1a5c | ||
|
|
e172ed6e43 |
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "uvpn-backend"
|
name = "uvpn-backend"
|
||||||
version = "0.7.0"
|
version = "0.7.1"
|
||||||
description = "FastAPI backend with Docker for uvpn.shop"
|
description = "FastAPI backend with Docker for uvpn.shop"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
requires-python = ">=3.12"
|
requires-python = ">=3.12"
|
||||||
|
|||||||
+24
-1
@@ -3,19 +3,42 @@ import logging
|
|||||||
from os import getenv
|
from os import getenv
|
||||||
from remnawave import RemnawaveSDK
|
from remnawave import RemnawaveSDK
|
||||||
from remnawave.models.hosts import GetAllHostsResponseDto
|
from remnawave.models.hosts import GetAllHostsResponseDto
|
||||||
|
import re
|
||||||
|
|
||||||
|
|
||||||
logging.basicConfig(level=logging.INFO)
|
logging.basicConfig(level=logging.INFO)
|
||||||
|
|
||||||
router = APIRouter(prefix='/api/v1', tags=['hosts'])
|
router = APIRouter(prefix='/api/v1', tags=['hosts'])
|
||||||
remnawave = RemnawaveSDK(base_url='http://remnawave:3000', token=getenv('REMNAWAVE_API_TOKEN'))
|
remnawave = RemnawaveSDK(base_url='http://remnawave:3000', token=getenv('REMNAWAVE_API_TOKEN'))
|
||||||
|
|
||||||
|
|
||||||
|
def clean_host_name(name):
|
||||||
|
"""
|
||||||
|
Очищает имя хоста от флагов и лишних символов.
|
||||||
|
Пример: '🇷🇺Russia Speed 🚀' -> 'Russia Speed'
|
||||||
|
"""
|
||||||
|
# Удаляем все флаги (региональные индикаторы)
|
||||||
|
flag_pattern = re.compile(r'[\U0001F1E6-\U0001F1FF]{2}')
|
||||||
|
cleaned = flag_pattern.sub('', name)
|
||||||
|
|
||||||
|
# Удаляем другие эмодзи (опционально)
|
||||||
|
emoji_pattern = re.compile(
|
||||||
|
"[\U0001F300-\U0001F9FF\U00002600-\U000027BF\U0001F000-\U0001F02F\U0001F0A0-\U0001F0FF]+",
|
||||||
|
flags=re.UNICODE
|
||||||
|
)
|
||||||
|
cleaned = emoji_pattern.sub('', cleaned)
|
||||||
|
|
||||||
|
# Убираем лишние пробелы
|
||||||
|
return cleaned.strip()
|
||||||
|
|
||||||
|
|
||||||
@router.get('/hosts')
|
@router.get('/hosts')
|
||||||
async def get_nodes():
|
async def get_nodes():
|
||||||
hosts: GetAllHostsResponseDto = await remnawave.hosts.get_all_hosts()
|
hosts: GetAllHostsResponseDto = await remnawave.hosts.get_all_hosts()
|
||||||
return [
|
return [
|
||||||
|
|
||||||
{
|
{
|
||||||
'name': host.remark,
|
'name': clean_host_name(host.remark),
|
||||||
'address': host.address,
|
'address': host.address,
|
||||||
'port': host.port
|
'port': host.port
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user