From 9372fe4c2683addf7dc8f55010cded1a62ad6f4e Mon Sep 17 00:00:00 2001 From: zenaku Date: Fri, 5 Jun 2026 18:45:13 -0500 Subject: [PATCH] remove .env.example --- .env.example | 6 ------ core/Constants.py | 39 ++++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 25 deletions(-) delete mode 100644 .env.example diff --git a/.env.example b/.env.example deleted file mode 100644 index d135e89..0000000 --- a/.env.example +++ /dev/null @@ -1,6 +0,0 @@ -APP_ENV= -SP_API_BASE_URL_LOCAL= -SP_API_BASE_URL_PRODUCTION= - -# SP_API_BASE_URL_LOCAL=http://simplifiedprivacy.test/api/v1 -# SP_API_BASE_URL_PRODUCTION=https://api.hydraveil.net/api/v1 diff --git a/core/Constants.py b/core/Constants.py index f45ffdd..1c7d4a0 100644 --- a/core/Constants.py +++ b/core/Constants.py @@ -1,26 +1,20 @@ from dataclasses import dataclass from typing import Final -from dotenv import load_dotenv import os -load_dotenv(os.path.join(os.path.dirname(__file__), '../.env')) - -_env = os.environ.get('APP_ENV', 'production') - -_sp_api_base_url = ( - os.environ.get('SP_API_BASE_URL_LOCAL', 'http://simplifiedprivacy.test/api/v1') - if _env == 'local' - else os.environ.get('SP_API_BASE_URL_PRODUCTION', 'https://api.hydraveil.net/api/v1') -) - @dataclass(frozen=True) class Constants: + TICKET_API_BASE_URL: Final[str] = os.environ.get( "TICKET_API_BASE_URL", "https://ticket.hydraveil.net" ) - SP_API_BASE_URL: Final[str] = _sp_api_base_url - PING_URL: Final[str] = os.environ.get('PING_URL', f'{_sp_api_base_url}/health') + SP_API_BASE_URL: Final[str] = os.environ.get( + 'SP_API_BASE_URL', 'https://fake.simplifiedprivacy.org/api/v1' + ) + PING_URL: Final[str] = os.environ.get( + 'PING_URL', 'https://fake.simplifiedprivacy.org/api/v1//health' + ) CONNECTION_RETRY_INTERVAL: Final[int] = int(os.environ.get('CONNECTION_RETRY_INTERVAL', '5')) MAX_CONNECTION_ATTEMPTS: Final[int] = int(os.environ.get('MAX_CONNECTION_ATTEMPTS', '2')) HV_CLIENT_PATH: Final[str] = os.environ.get('HV_CLIENT_PATH') @@ -29,13 +23,12 @@ class Constants: # ── Paths base ──────────────────────────────────────────────────────────── HOME: Final[str] = os.path.expanduser('~') SYSTEM_CONFIG_PATH: Final[str] = '/etc' - INSTALL_DIR: Final[str] = os.environ.get('INSTALL_DIR', os.path.expanduser('~')) - # ── XDG ─────────────────────────────────────────────────────────────────── - CACHE_HOME: Final[str] = os.environ.get('XDG_CACHE_HOME', f'{INSTALL_DIR}/.cache') - CONFIG_HOME: Final[str] = os.environ.get('XDG_CONFIG_HOME', f'{INSTALL_DIR}/.config') - DATA_HOME: Final[str] = os.environ.get('XDG_DATA_HOME', f'{INSTALL_DIR}/data') - STATE_HOME: Final[str] = os.environ.get('XDG_STATE_HOME', f'{INSTALL_DIR}/.state') + # ── XDG estándar ───────────────────────────────────────────────────────── + CACHE_HOME: Final[str] = os.environ.get('XDG_CACHE_HOME', os.path.join(HOME, '.cache')) + CONFIG_HOME: Final[str] = os.environ.get('XDG_CONFIG_HOME', os.path.join(HOME, '.config')) + DATA_HOME: Final[str] = os.environ.get('XDG_DATA_HOME', os.path.join(HOME, '.local/share')) + STATE_HOME: Final[str] = os.environ.get('XDG_STATE_HOME', os.path.join(HOME, '.local/state')) # ── hydra-veil dirs ─────────────────────────────────────────────────────── HV_SYSTEM_CONFIG_PATH: Final[str] = f'{SYSTEM_CONFIG_PATH}/hydra-veil' @@ -68,3 +61,11 @@ class Constants: SINGBOX_CONFIG_DIR: Final[str] = f'{HV_DATA_HOME}/configs' SINGBOX_PID_FILE: Final[str] = f'{HV_RUNTIME_DATA_HOME}/singbox.pid' SINGBOX_LOG_FILE: Final[str] = f'{HV_RUNTIME_DATA_HOME}/singbox.log' + + # ── killswitch / dns wrappers ───────────────────────────────────────────── + KILLSWITCH_WRAPPER: Final[str] = os.environ.get( + 'KILLSWITCH_WRAPPER', '/usr/local/bin/hydraveil-killswitch' + ) + RESOLVECTL_WRAPPER: Final[str] = os.environ.get( + 'RESOLVECTL_WRAPPER', '/usr/local/bin/hydraveil-resolvectl' + ) \ No newline at end of file