bivashy/Blitz-Proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(server): Use database for online user count

Browse Source
This commit is contained in:
ReturnFI
2025-11-04 19:01:58 +00:00
parent 4ffa6befc1
commit caf44aafcb
1 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
core/scripts/hysteria2/server_info.py
View File

@ -9,29 +9,10 @@ import subprocess
import re import re
from concurrent.futures import ThreadPoolExecutor from concurrent.futures import ThreadPoolExecutor
from functools import lru_cache from functools import lru_cache
from hysteria2_api import Hysteria2Client
import init_paths import init_paths
from paths import CONFIG_FILE, API_BASE_URL
from db.database import db from db.database import db
@lru_cache(maxsize=1)
def get_secret() -> str:
if not CONFIG_FILE.exists():
print("Error: config.json file not found!", file=sys.stderr)
sys.exit(1)
with CONFIG_FILE.open() as f:
data = json.load(f)
secret = data.get("trafficStats", {}).get("secret")
if not secret:
print("Error: secret not found in config.json!", file=sys.stderr)
sys.exit(1)
return secret
def convert_bytes(bytes_val: int) -> str: def convert_bytes(bytes_val: int) -> str:
if bytes_val >= (1 << 40): if bytes_val >= (1 << 40):
return f"{bytes_val / (1 << 40):.2f} TB" return f"{bytes_val / (1 << 40):.2f} TB"
@ -191,23 +172,23 @@ async def get_connection_counts() -> tuple[int, int]:
return parse_connection_counts(tcp_content, udp_content) return parse_connection_counts(tcp_content, udp_content)
def get_online_user_count_sync(secret: str) -> int: def get_online_user_count_sync() -> int:
if db is None:
print("Error: Database connection failed.", file=sys.stderr)
return 0
try: try:
client = Hysteria2Client( users = db.get_all_users()
base_url=API_BASE_URL, total_online = sum(int(user.get("online_count", 0) or 0) for user in users)
secret=secret return total_online
)
online_users = client.get_online_clients()
return sum(user.connections for user in online_users.values() if user.is_online)
except Exception as e: except Exception as e:
print(f"Error getting online users: {e}", file=sys.stderr) print(f"Error retrieving online user count from database: {e}", file=sys.stderr)
return 0 return 0
async def get_online_user_count(secret: str) -> int: async def get_online_user_count() -> int:
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()
with ThreadPoolExecutor() as executor: with ThreadPoolExecutor() as executor:
return await loop.run_in_executor(executor, get_online_user_count_sync, secret) return await loop.run_in_executor(executor, get_online_user_count_sync)
def get_user_traffic_sync() -> tuple[int, int]: def get_user_traffic_sync() -> tuple[int, int]:
@ -279,13 +260,11 @@ async def get_interface_addresses_async():
async def main(): async def main():
secret = get_secret()
tasks = [ tasks = [
get_uptime_and_boottime(), get_uptime_and_boottime(),
get_memory_usage(), get_memory_usage(),
get_connection_counts(), get_connection_counts(),
get_online_user_count(secret), get_online_user_count(),
get_user_traffic(), get_user_traffic(),
get_cpu_usage(0.1), get_cpu_usage(0.1),
get_network_speed(0.3), get_network_speed(0.3),