Fix + Docker

This commit is contained in:
Lev 2026-04-16 21:07:58 +03:00
parent 8aa4828239
commit 0e71fe7abe
10 changed files with 92 additions and 35 deletions

View file

@ -42,7 +42,6 @@ async def create_config(body: ConfigCreate, current_user: User = Depends(get_cur
client_email_xui = f"{current_user.email}-{body.name}"
display_name = f"SpectralVPN-{body.name}"
config_url = await xui.add_client(
inbound_id=server.inbound_id,
client_email=client_email_xui,
display_name=display_name
)
@ -119,10 +118,10 @@ async def delete_config(body: ConfigDelete, current_user: User = Depends(get_cur
.options(selectinload(User.server))
)
server = server_result.scalar_one().server
if server and server.inbound_id:
if server:
xui = await XUIClient.from_server(server)
client_email_xui = f"{current_user.email}-{body.name}"
await xui.delete_client(server.inbound_id, client_email_xui)
await xui.delete_client(client_email_xui)
except:
HTTPException(
status_code=500,

View file

@ -10,27 +10,26 @@ router = APIRouter(prefix="/server")
@router.post("/add", status_code=201)
async def add_server(body: ServerAdd, request: Request, db: AsyncSession = Depends(get_db)):
ip = request.client.host
existing = await db.execute(
select(Server).where(
(Server.name == body.name) |
(Server.code == body.code) |
(Server.host == ip)
(Server.code == body.code)
)
)
if existing.scalar_one_or_none():
raise HTTPException(
status_code=409,
detail="Name, ip or code is already exists"
detail="Nameor code is already exists"
)
new_server = Server(
name=body.name,
code=body.code,
host=ip,
host=body.host,
port=body.port,
user=body.user,
password=body.password,
inbound_id=body.inbound_id
inbound_id=body.inbound_id,
version=body.version
)
db.add(new_server)
await db.commit()