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

Implement get-services-status in cli.py & Refactor

Browse Source 
get-webpanel-services-status to use cli_api.get_services_status()
This commit is contained in:
Iam54r1n4
2025-02-07 18:46:01 +00:00
parent 26ce040d67
commit 15d8f00417
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/cli.py
View File

@ -92,7 +92,7 @@ def backup_hysteria2():
# region User # region User
@ cli.command('list-users') @cli.command('list-users')
def list_users(): def list_users():
try: try:
res = cli_api.list_users() res = cli_api.list_users()
@ -145,8 +145,8 @@ def edit_user(username: str, new_username: str, new_traffic_limit: int, new_expi
click.echo(f'{e}', err=True) click.echo(f'{e}', err=True)
@ cli.command('reset-user') @cli.command('reset-user')
@ click.option('--username', '-u', required=True, help='Username for the user to Reset', type=str) @click.option('--username', '-u', required=True, help='Username for the user to Reset', type=str)
def reset_user(username: str): def reset_user(username: str):
try: try:
cli_api.reset_user(username) cli_api.reset_user(username)
@ -155,8 +155,8 @@ def reset_user(username: str):
click.echo(f'{e}', err=True) click.echo(f'{e}', err=True)
@ cli.command('remove-user') @cli.command('remove-user')
@ click.option('--username', '-u', required=True, help='Username for the user to remove', type=str) @click.option('--username', '-u', required=True, help='Username for the user to remove', type=str)
def remove_user(username: str): def remove_user(username: str):
try: try:
cli_api.remove_user(username) cli_api.remove_user(username)
@ -186,7 +186,7 @@ def show_user_uri(username: str, qrcode: bool, ipv: int, all: bool, singbox: boo
# region Server # region Server
@ cli.command('traffic-status') @cli.command('traffic-status')
def traffic_status(): def traffic_status():
try: try:
cli_api.traffic_status() cli_api.traffic_status()
@ -292,7 +292,7 @@ def masquerade(remove: bool, enable: str):
# region Advanced Menu # region Advanced Menu
@ cli.command('install-tcp-brutal') @cli.command('install-tcp-brutal')
def install_tcp_brutal(): def install_tcp_brutal():
try: try:
cli_api.install_tcp_brutal() cli_api.install_tcp_brutal()
@ -301,7 +301,7 @@ def install_tcp_brutal():
click.echo(f'{e}', err=True) click.echo(f'{e}', err=True)
@ cli.command('install-warp') @cli.command('install-warp')
def install_warp(): def install_warp():
try: try:
cli_api.install_warp() cli_api.install_warp()
@ -310,7 +310,7 @@ def install_warp():
click.echo(f'{e}', err=True) click.echo(f'{e}', err=True)
@ cli.command('uninstall-warp') @cli.command('uninstall-warp')
def uninstall_warp(): def uninstall_warp():
try: try:
cli_api.uninstall_warp() cli_api.uninstall_warp()
@ -455,11 +455,25 @@ def get_web_panel_api_token():
@cli.command('get-webpanel-services-status') @cli.command('get-webpanel-services-status')
def get_web_panel_services_status(): def get_web_panel_services_status():
try: try:
if services_status := cli_api.get_webpanel_services_status(): if services_status := cli_api.get_services_status():
for service, status in services_status.items(): webpanel_status = services_status.get('webpanel', False)
click.echo(f"{service}.service: {'Active' if status else 'Inactive'}") caddy_status = services_status.get('caddy', False)
print(f"webpanel.service: {'Active' if webpanel_status else 'Inactive'}")
print(f"caddy.service: {'Active' if caddy_status else 'Inactive'}")
else: else:
click.echo('Error: WebPanel services status not available.') click.echo('Error: Services status not available.')
except Exception as e:
click.echo(f'{e}', err=True)
@cli.command('get-services-status')
def get_services_status():
try:
if services_status := cli_api.get_services_status():
for service, status in services_status.items():
click.echo(f"{service}: {'Active' if status else 'Inactive'}")
else:
click.echo('Error: Services status not available.')
except Exception as e: except Exception as e:
click.echo(f'{e}', err=True) click.echo(f'{e}', err=True)
# endregion # endregion