From f20f9528aa3cc22b8294bd462ad519615eb965cc Mon Sep 17 00:00:00 2001 From: Lev Date: Mon, 8 Dec 2025 22:00:40 +0300 Subject: [PATCH] configs --- .gitignore | 3 ++- API/main.py | 6 +++++- API/utils.py | 7 +++---- Frontend/JS/register.js | 2 +- configs/config/params.conf | 7 +++++++ configs/nginx/spectralvpn.ru.nginx | 7 +++++++ configs/nginx/spectralvpn.ru_http.nginx | 7 +++++++ configs/nginx/spectralvpn_api.nginx | 3 +++ requirments.txt | 3 ++- 9 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 configs/config/params.conf create mode 100644 configs/nginx/spectralvpn.ru.nginx create mode 100644 configs/nginx/spectralvpn.ru_http.nginx create mode 100644 configs/nginx/spectralvpn_api.nginx diff --git a/.gitignore b/.gitignore index b694934..cbde85d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.venv \ No newline at end of file +.venv +configs/config/params_spectralvpn.conf \ No newline at end of file diff --git a/API/main.py b/API/main.py index 3fa3cce..f5721b4 100644 --- a/API/main.py +++ b/API/main.py @@ -1,9 +1,13 @@ from fastapi import FastAPI, HTTPException, Query, status from pydantic import BaseModel, EmailStr +import configparser import utils app = FastAPI() -args = ["", "", "", "", 0, "", ""] + +config = configparser.ConfigParser() +config.read('../configs/config/params.conf', encoding='utf-8') +args = [config["api"]["path"], config["api"]["host"], config["api"]["username"], config["api"]["password"], config.getint("api", "inbaund_id"), config["api"]["inbaund_url"]] class RegisterBody(BaseModel) : email : EmailStr diff --git a/API/utils.py b/API/utils.py index 3b906dd..b391cfd 100644 --- a/API/utils.py +++ b/API/utils.py @@ -8,7 +8,7 @@ import requests import random class API : - def __init__(self, path: str, host: str, username: str, passwd: str, inbaund_id: int, inbaund_url: str, inbaund_port: str) : + def __init__(self, path: str, host: str, username: str, passwd: str, inbaund_id: int, inbaund_url: str) : self.con = sqlite3.connect(path) self.cur = self.con.cursor() self.cur.execute(""" @@ -38,7 +38,6 @@ class API : self.inbaund_id = inbaund_id self.inbaund_url = inbaund_url - self.inbaund_port = inbaund_port def read_table(self, sql_command: str, params=None) -> dict : if params == None : @@ -148,7 +147,7 @@ class API : if inbaund == None : raise TypeError - url = f"vless://{uid}@{self.inbaund_url}:{self.inbaund_port}?security=reality&pbk={pbk}&fp=random&sni={sni}&sid={suid}&spx=%2F&flow=xtls-rprx-vision#SpectralVPN-{url_name}" + url = f"vless://{uid}@{self.inbaund_url}?security=reality&pbk={pbk}&fp=random&sni={sni}&sid={suid}&spx=%2F&flow=xtls-rprx-vision#SpectralVPN-{url_name}" urls.append(url_name) @@ -201,7 +200,7 @@ class API : if client == None : raise TypeError uid = client["id"] - url = f"vless://{uid}@{self.inbaund_url}:{self.inbaund_port}?security=reality&pbk={pbk}&fp=random&sni={sni}&sid={suid}&spx=%2F&flow=xtls-rprx-vision#SpectralVPN-{url_name}" + url = f"vless://{uid}@{self.inbaund_url}?security=reality&pbk={pbk}&fp=random&sni={sni}&sid={suid}&spx=%2F&flow=xtls-rprx-vision#SpectralVPN-{url_name}" return {"code": 0, "data": {"id": int(data["id"]["0"]), "email": email, "urls": urls, "url": url}} diff --git a/Frontend/JS/register.js b/Frontend/JS/register.js index ebd0c07..0cde9f1 100644 --- a/Frontend/JS/register.js +++ b/Frontend/JS/register.js @@ -1,5 +1,5 @@ const port = 8000; -const API_URL = "https://spectralvpn.ru:${port}"; +const API_URL = "http://localhost:${port}"; async function sha256(text) { const encoder = new TextEncoder(); diff --git a/configs/config/params.conf b/configs/config/params.conf new file mode 100644 index 0000000..d640acf --- /dev/null +++ b/configs/config/params.conf @@ -0,0 +1,7 @@ +[api] +path = spectralvpn.db +host = +username = +password = +inbaund_id = 0 +inbaund_url = \ No newline at end of file diff --git a/configs/nginx/spectralvpn.ru.nginx b/configs/nginx/spectralvpn.ru.nginx new file mode 100644 index 0000000..14653ee --- /dev/null +++ b/configs/nginx/spectralvpn.ru.nginx @@ -0,0 +1,7 @@ +https { + listen 443; + listen [::]:443; + server_name spectralvpn.ru; + + root /var/www/html/spectralvpn.ru; +} \ No newline at end of file diff --git a/configs/nginx/spectralvpn.ru_http.nginx b/configs/nginx/spectralvpn.ru_http.nginx new file mode 100644 index 0000000..e28b66a --- /dev/null +++ b/configs/nginx/spectralvpn.ru_http.nginx @@ -0,0 +1,7 @@ +http { + listen 80 spectralvpn.ru; + listen [::]:80 spectralvpn.ru; + + root /var/www/html/spectralvpn.ru; + Pages/index.html; +} \ No newline at end of file diff --git a/configs/nginx/spectralvpn_api.nginx b/configs/nginx/spectralvpn_api.nginx new file mode 100644 index 0000000..5d2400b --- /dev/null +++ b/configs/nginx/spectralvpn_api.nginx @@ -0,0 +1,3 @@ +server { + +} \ No newline at end of file diff --git a/requirments.txt b/requirments.txt index ca166b7..7953068 100644 --- a/requirments.txt +++ b/requirments.txt @@ -1,2 +1,3 @@ fastapi[all] -pandas \ No newline at end of file +pandas +configparser \ No newline at end of file