hiddifypanel 10.50.5.dev0__tar.gz → 10.60.0.dev0__tar.gz

{hiddifypanel-10.50.5.dev0 → hiddifypanel-10.60.0.dev0}/HISTORY.md

@@ -5,14 +5,32 @@
 
 #### New
 
+* Add html editor for user custom text. 
+
+* Add wiregaurd output for wireguard application. 
+
 * Add splithttp. 
 
 * Add lock in updating usage. 
 
 * Add try catch in get user usage. 
 
+#### Changes
+
+* Work splithttp in hiddify. 
+
 #### Fix
 
+* Bug???? 
+
+* Api patch bug. 
+
+* Bot issue. 
+
+* Permission issue. 
+
+* Incorrect ssh warning. 
+
 * Reality issue. 
 
 * Bug. 
@@ -23,6 +41,14 @@
 
 #### Other
 
+* Update translations. 
+
+* Better reinstall or apply policy. 
+
+* Merge branch 'main' of github.com:hiddify/Hiddify-Panel. 
+
+* Update translations. 
+
 * Reduce overhead. 
 
 * Reduce overhead. 

{hiddifypanel-10.50.5.dev0 → hiddifypanel-10.60.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 10.50.5.dev0
+Version: 10.60.0.dev0
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-manager/
 Author: hiddify

hiddifypanel-10.60.0.dev0/hiddifypanel/VERSION

@@ -0,0 +1 @@
+10.60.0.dev0

hiddifypanel-10.60.0.dev0/hiddifypanel/VERSION.py

@@ -0,0 +1,3 @@
+__version__='10.60.0.dev0'
+from datetime import datetime
+__release_date__= datetime.strptime('2024-07-25','%Y-%m-%d')

{hiddifypanel-10.50.5.dev0 → hiddifypanel-10.60.0.dev0}/hiddifypanel/hutils/flask.py

@@ -4,6 +4,8 @@ from wtforms.validators import ValidationError
 from apiflask import abort as apiflask_abort
 from flask_babel import gettext as _
 from flask import url_for  # type: ignore
+from flask import abort as flask_abort
+from markupsafe import Markup
 from urllib.parse import urlparse
 from strenum import StrEnum
 
@@ -24,7 +26,7 @@ def flash(message: str, category: str = "message"):
 
 def flash_config_success(restart_mode: ApplyMode = ApplyMode.nothing, domain_changed=True):
     if restart_mode != ApplyMode.nothing:
-        url = hurl_for('admin.Actions:reinstall', complete_install=restart_mode == ApplyMode.restart, domain_changed=domain_changed)
+        url = hurl_for('admin.Actions:reinstall', complete_install=restart_mode == ApplyMode.reinstall, domain_changed=domain_changed)
         apply_btn = f"<a href='{url}' class='btn btn-primary form_post'>" + \
             _("admin.config.apply_configs") + "</a>"
         flash((_('config.validation-success', link=apply_btn)), 'success')  # type: ignore
@@ -220,9 +222,9 @@ def proxy_path_validator(proxy_path: str) -> None:
 
     if is_api_call(request.path):
         if __is_admin_api_call() and proxy_path != admin_proxy_path:
-            return apiflask_abort(400, Markup(f"Invalid Proxy Path <a href=/{admin_proxy_path}/admin>Admin Panel</a>")) if dbg_mode else apiflask_abort(400, 'invalid request')
+            return flask_abort(400, Markup(f"Invalid Proxy Path <a href=/{admin_proxy_path}/admin>Admin Panel</a>")) if dbg_mode else apiflask_abort(400, 'invalid request')
         if is_user_api_call() and proxy_path != client_proxy_path:
-            return apiflask_abort(400, Markup(f"Invalid Proxy Path <a href=/{client_proxy_path}/admin>User Panel</a>")) if dbg_mode else apiflask_abort(400, 'invalid request')
+            return flask_abort(400, Markup(f"Invalid Proxy Path <a href=/{client_proxy_path}/admin>User Panel</a>")) if dbg_mode else apiflask_abort(400, 'invalid request')
 
 
 def list_dir_files(dir_path: str) -> List[str]:

{hiddifypanel-10.50.5.dev0 → hiddifypanel-10.60.0.dev0}/hiddifypanel/hutils/network/net.py

@@ -1,3 +1,4 @@
+import glob
 from typing import List, Literal, Set, Union
 from urllib.parse import urlparse
 import urllib.request
@@ -282,14 +283,24 @@ def get_warp_info() -> str:
 
 
 def is_ssh_password_authentication_enabled() -> bool:
-    if os.path.isfile('/etc/ssh/sshd_config'):
-        with open('/etc/ssh/sshd_config', 'r') as f:
-            for line in f.readlines():
-                line = line.strip()
-                if line.startswith('#'):
-                    continue
-                if re.search("^PasswordAuthentication\\s+no", line, re.IGNORECASE):
-                    return False
+    def check_file(file_path: str) -> bool:
+        if os.path.isfile(file_path):
+            try:
+                with open(file_path, 'r') as f:
+                    for line in f.readlines():
+                        line = line.strip()
+                        if line.startswith('#'):
+                            continue
+                        if re.search(r"^PasswordAuthentication\s+no", line, re.IGNORECASE):
+                            return False
+            except Exception as e:
+                print(e)
+
+        return True
+
+    for config_file in glob.glob("/etc/ssh/sshd*") + glob.glob("/etc/ssh/sshd*/*"):
+        if not check_file(config_file):
+            return False
 
     return True
 
@@ -319,7 +330,7 @@ def add_number_to_ipv6(ip: str, number: int) -> str:
     return modified_ipv6
 
 
-@cache.cache(600)
+@ cache.cache(600)
 def is_in_same_asn(domain_or_ip: str, domain_or_ip_target: str) -> bool:
     '''Returns True if domain is in panel ASN'''
     try:
@@ -344,7 +355,7 @@ def is_in_same_asn(domain_or_ip: str, domain_or_ip_target: str) -> bool:
         #                    f"<br> Server ASN={asn_ipv4.get('autonomous_system_organization','unknown')}<br>{domain}_ASN={asn_dip.get('autonomous_system_organization','unknown')}", "warning")
 
 
-@cache.cache(600)
+@ cache.cache(600)
 def get_ip_asn(ip: ipaddress.IPv4Address | ipaddress.IPv6Address | str) -> str:
     if not IPASN:
         return __get_ip_asn_api(ip)
@@ -364,7 +375,7 @@ def __get_ip_asn_api(ip: ipaddress.IPv4Address | ipaddress.IPv6Address | str) ->
     return str(requests.get(endpoint).content)
 
 
-@cache.cache(3600)
+@ cache.cache(3600)
 def is_ip(input: str):
     try:
         _ = ipaddress.ip_address(input)

{hiddifypanel-10.50.5.dev0 → hiddifypanel-10.60.0.dev0}/hiddifypanel/hutils/proxy/singbox.py

@@ -2,6 +2,7 @@ from flask import render_template, request, g
 import json
 
 from hiddifypanel import hutils
+from hiddifypanel.hutils.proxy.xrayjson import to_xray
 from hiddifypanel.models import ProxyProto, ProxyTransport, Domain, ConfigEnum
 
 
@@ -43,6 +44,12 @@ def configs_as_json(domains: list[Domain], **kwargs) -> str:
     return res
 
 
+def is_xray_proxy(proxy: dict):
+    if proxy['transport'] == ProxyTransport.splithttp:
+        return True
+    return False
+
+
 def to_singbox(proxy: dict) -> list[dict] | dict:
     name = proxy['name']
 
@@ -54,6 +61,12 @@ def to_singbox(proxy: dict) -> list[dict] | dict:
     all_base.append(base)
     # vmess ws
     base["tag"] = f"""{proxy['extra_info']} {proxy["name"]} § {proxy['port']} {proxy["dbdomain"].id}"""
+    if is_xray_proxy(proxy):
+        if hutils.flask.is_client_version(hutils.flask.ClientVersion.hiddify_next, 1, 9, 0):
+            base['type'] = "xray"
+            base['xray_outbound_raw'] = to_xray(proxy)
+            return all_base
+        return {'name': name, 'msg': "xray proxy does not support in this client version", 'type': 'debug'}
     base["type"] = str(proxy["proto"])
     base["server"] = proxy["server"]
     base["server_port"] = int(proxy["port"])

{hiddifypanel-10.50.5.dev0 → hiddifypanel-10.60.0.dev0}/hiddifypanel/hutils/proxy/xray.py

@@ -126,11 +126,14 @@ def to_link(proxy: dict) -> str | dict:
         baseurl += "&encryption=none"
     if proxy.get('fingerprint', 'none') != 'none':
         baseurl += "&fp=" + proxy['fingerprint']
+    if proxy.get('transport') in {ProxyTransport.splithttp}:
+        baseurl += "&core=xray"
     if proxy['l3'] != 'quic':
         if proxy.get('l3') != ProxyL3.reality and (proxy.get('transport') in {ProxyTransport.tcp, ProxyTransport.httpupgrade, ProxyTransport.splithttp}) and proxy['proto'] in [ProxyProto.vless, ProxyProto.trojan]:
             baseurl += '&headerType=http'
         else:
             baseurl += '&headerType=None'
+
     if proxy['mode'] == 'Fake' or proxy['allow_insecure']:
         baseurl += "&allowInsecure=true"
     if proxy.get('flow'):

{hiddifypanel-10.50.5.dev0 → hiddifypanel-10.60.0.dev0}/hiddifypanel/models/config_enum.py

@@ -64,8 +64,8 @@ class ConfigCategory(StrEnum):
 
 
 class ApplyMode(StrEnum):
-    apply = auto()
-    restart = auto()
+    apply_config = auto()
+    reinstall = auto()
     nothing = auto()
 
 
@@ -89,7 +89,7 @@ class ConfigEnum(metaclass=FastEnum):
     # category: ConfigCategory
     __slots__ = ('name', 'value', 'category', 'apply_mode', 'type', 'show_in_parent', 'hide_in_virtual_child')
 
-    def __init__(self, category: ConfigCategory, apply_mode: ApplyMode = ApplyMode.apply, ctype=type, show_in_parent: bool = True, hide_in_virtual_child=False, name=auto):
+    def __init__(self, category: ConfigCategory, apply_mode: ApplyMode = ApplyMode.apply_config, ctype=type, show_in_parent: bool = True, hide_in_virtual_child=False, name=auto):
         self.value = name
         self.name = name
         self.category = category
@@ -101,41 +101,41 @@ class ConfigEnum(metaclass=FastEnum):
     @classmethod
     def dbvalues(cls):
         return {c.name: c for c in ConfigEnum}
-    create_easysetup_link = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply, hide_in_virtual_child=True)
-    wireguard_enable = _BoolConfigDscr(ConfigCategory.wireguard, ApplyMode.apply, hide_in_virtual_child=True)
-    wireguard_port = _StrConfigDscr(ConfigCategory.wireguard, ApplyMode.apply, hide_in_virtual_child=True)
-    wireguard_ipv6 = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply, hide_in_virtual_child=True)
-    wireguard_ipv4 = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply, hide_in_virtual_child=True)
-    wireguard_private_key = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply, hide_in_virtual_child=True)
-    wireguard_public_key = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply, hide_in_virtual_child=True)
-    wireguard_noise_trick = _StrConfigDscr(ConfigCategory.wireguard, ApplyMode.apply)
+    create_easysetup_link = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.nothing, hide_in_virtual_child=True)
+    wireguard_enable = _BoolConfigDscr(ConfigCategory.wireguard, ApplyMode.reinstall, hide_in_virtual_child=True)
+    wireguard_port = _StrConfigDscr(ConfigCategory.wireguard, ApplyMode.apply_config, hide_in_virtual_child=True)
+    wireguard_ipv6 = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config, hide_in_virtual_child=True)
+    wireguard_ipv4 = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config, hide_in_virtual_child=True)
+    wireguard_private_key = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config, hide_in_virtual_child=True)
+    wireguard_public_key = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config, hide_in_virtual_child=True)
+    wireguard_noise_trick = _StrConfigDscr(ConfigCategory.wireguard, ApplyMode.apply_config)
 
     ssh_server_redis_url = _StrConfigDscr(ConfigCategory.hidden, hide_in_virtual_child=True)
-    ssh_server_port = _StrConfigDscr(ConfigCategory.ssh, ApplyMode.apply, hide_in_virtual_child=True)
-    ssh_server_enable = _BoolConfigDscr(ConfigCategory.ssh, ApplyMode.apply)
+    ssh_server_port = _StrConfigDscr(ConfigCategory.ssh, ApplyMode.apply_config, hide_in_virtual_child=True)
+    ssh_server_enable = _BoolConfigDscr(ConfigCategory.ssh, ApplyMode.reinstall)
     first_setup = _BoolConfigDscr(ConfigCategory.hidden)
-    core_type = _StrConfigDscr(ConfigCategory.advanced, ApplyMode.apply, hide_in_virtual_child=True)
-    warp_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.restart, hide_in_virtual_child=True)
-    warp_mode = _StrConfigDscr(ConfigCategory.warp, ApplyMode.restart, hide_in_virtual_child=True)
-    warp_plus_code = _StrConfigDscr(ConfigCategory.warp, ApplyMode.apply, hide_in_virtual_child=True)
-    warp_sites = _StrConfigDscr(ConfigCategory.warp, ApplyMode.apply, hide_in_virtual_child=True)
-    dns_server = _StrConfigDscr(ConfigCategory.general, ApplyMode.apply, hide_in_virtual_child=True)
-    reality_fallback_domain = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply)  # removed
-    reality_server_names = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply)  # removed
-    reality_short_ids = _StrConfigDscr(ConfigCategory.reality, ApplyMode.apply, hide_in_virtual_child=True)
-    reality_private_key = _StrConfigDscr(ConfigCategory.reality, ApplyMode.apply, hide_in_virtual_child=True)
-    reality_public_key = _StrConfigDscr(ConfigCategory.reality, ApplyMode.apply, hide_in_virtual_child=True)
-    reality_port = _StrConfigDscr(ConfigCategory.reality, ApplyMode.apply, hide_in_virtual_child=True)
+    core_type = _StrConfigDscr(ConfigCategory.advanced, ApplyMode.reinstall, hide_in_virtual_child=True)
+    warp_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.reinstall, hide_in_virtual_child=True)
+    warp_mode = _StrConfigDscr(ConfigCategory.warp, ApplyMode.apply_config, hide_in_virtual_child=True)
+    warp_plus_code = _StrConfigDscr(ConfigCategory.warp, ApplyMode.apply_config, hide_in_virtual_child=True)
+    warp_sites = _StrConfigDscr(ConfigCategory.warp, ApplyMode.apply_config, hide_in_virtual_child=True)
+    dns_server = _StrConfigDscr(ConfigCategory.general, ApplyMode.apply_config, hide_in_virtual_child=True)
+    reality_fallback_domain = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config)  # removed
+    reality_server_names = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config)  # removed
+    reality_short_ids = _StrConfigDscr(ConfigCategory.reality, ApplyMode.apply_config, hide_in_virtual_child=True)
+    reality_private_key = _StrConfigDscr(ConfigCategory.reality, ApplyMode.apply_config, hide_in_virtual_child=True)
+    reality_public_key = _StrConfigDscr(ConfigCategory.reality, ApplyMode.apply_config, hide_in_virtual_child=True)
+    reality_port = _StrConfigDscr(ConfigCategory.reality, ApplyMode.apply_config, hide_in_virtual_child=True)
 
     restls1_2_domain = _StrConfigDscr(ConfigCategory.hidden)
     restls1_3_domain = _StrConfigDscr(ConfigCategory.hidden)
     show_usage_in_sublink = _BoolConfigDscr(ConfigCategory.general)
-    cloudflare = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply)
+    cloudflare = _StrConfigDscr(ConfigCategory.too_advanced)
     license = _StrConfigDscr(ConfigCategory.hidden)
-    country = _StrConfigDscr(ConfigCategory.general, ApplyMode.restart, hide_in_virtual_child=True)
+    country = _StrConfigDscr(ConfigCategory.general, ApplyMode.reinstall, hide_in_virtual_child=True)
     package_mode = _StrConfigDscr(ConfigCategory.advanced, hide_in_virtual_child=True)
     utls = _StrConfigDscr(ConfigCategory.advanced)
-    telegram_bot_token = _StrConfigDscr(ConfigCategory.telegram, ApplyMode.apply, hide_in_virtual_child=True)
+    telegram_bot_token = _StrConfigDscr(ConfigCategory.telegram, hide_in_virtual_child=True)
 
     # region child-parent
     # deprecated
@@ -147,10 +147,10 @@ class ConfigEnum(metaclass=FastEnum):
 
     # the panel mode could be one of these: "parent", "child", "standalone"
     # this config value would be 'standalone' by default. and would be set by panel itself
-    panel_mode = _TypedConfigDscr(PanelMode, ConfigCategory.hidden, ApplyMode.nothing, hide_in_virtual_child=True)
+    panel_mode = _TypedConfigDscr(PanelMode, ConfigCategory.hidden, hide_in_virtual_child=True)
     # endregion
 
-    log_level = _TypedConfigDscr(LogLevel, ConfigCategory.hidden, ApplyMode.restart, hide_in_virtual_child=True)
+    log_level = _TypedConfigDscr(LogLevel, ConfigCategory.hidden, ApplyMode.reinstall, hide_in_virtual_child=True)
 
     unique_id = _StrConfigDscr(ConfigCategory.hidden)
     last_hash = _StrConfigDscr(ConfigCategory.hidden)
@@ -160,113 +160,113 @@ class ConfigEnum(metaclass=FastEnum):
     admin_secret = _StrConfigDscr(ConfigCategory.hidden)  # removed
 
     # tls
-    tls_ports = _StrConfigDscr(ConfigCategory.tls, ApplyMode.apply)
+    tls_ports = _StrConfigDscr(ConfigCategory.tls, ApplyMode.apply_config)
 
-    tls_fragment_enable = _BoolConfigDscr(ConfigCategory.tls_trick, ApplyMode.apply)
-    tls_fragment_size = _StrConfigDscr(ConfigCategory.tls_trick, ApplyMode.apply)
-    tls_fragment_sleep = _StrConfigDscr(ConfigCategory.tls_trick, ApplyMode.apply)
-    tls_mixed_case = _BoolConfigDscr(ConfigCategory.tls_trick, ApplyMode.apply)
-    tls_padding_enable = _BoolConfigDscr(ConfigCategory.tls_trick, ApplyMode.apply)
-    tls_padding_length = _StrConfigDscr(ConfigCategory.tls_trick, ApplyMode.apply)
+    tls_fragment_enable = _BoolConfigDscr(ConfigCategory.tls_trick)
+    tls_fragment_size = _StrConfigDscr(ConfigCategory.tls_trick)
+    tls_fragment_sleep = _StrConfigDscr(ConfigCategory.tls_trick)
+    tls_mixed_case = _BoolConfigDscr(ConfigCategory.tls_trick)
+    tls_padding_enable = _BoolConfigDscr(ConfigCategory.tls_trick, ApplyMode.apply_config)
+    tls_padding_length = _StrConfigDscr(ConfigCategory.tls_trick, ApplyMode.apply_config)
 
     # mux
-    mux_enable = _BoolConfigDscr(ConfigCategory.mux, ApplyMode.apply)
-    mux_protocol = _StrConfigDscr(ConfigCategory.mux, ApplyMode.apply)
-    mux_max_connections = _IntConfigDscr(ConfigCategory.mux, ApplyMode.apply)
-    mux_min_streams = _IntConfigDscr(ConfigCategory.mux, ApplyMode.apply)
-    mux_max_streams = _IntConfigDscr(ConfigCategory.mux, ApplyMode.apply)
-    mux_padding_enable = _BoolConfigDscr(ConfigCategory.mux, ApplyMode.apply)
-    mux_brutal_enable = _BoolConfigDscr(ConfigCategory.mux, ApplyMode.apply)
-    mux_brutal_up_mbps = _IntConfigDscr(ConfigCategory.mux, ApplyMode.apply)
-    mux_brutal_down_mbps = _IntConfigDscr(ConfigCategory.mux, ApplyMode.apply)
-
-    http_ports = _StrConfigDscr(ConfigCategory.http, ApplyMode.apply)
-    kcp_ports = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply)
-    kcp_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply)
-    decoy_domain = _StrConfigDscr(ConfigCategory.general, ApplyMode.apply, hide_in_virtual_child=True)
+    mux_enable = _BoolConfigDscr(ConfigCategory.mux, ApplyMode.apply_config)
+    mux_protocol = _StrConfigDscr(ConfigCategory.mux, ApplyMode.apply_config)
+    mux_max_connections = _IntConfigDscr(ConfigCategory.mux, ApplyMode.apply_config)
+    mux_min_streams = _IntConfigDscr(ConfigCategory.mux, ApplyMode.apply_config)
+    mux_max_streams = _IntConfigDscr(ConfigCategory.mux, ApplyMode.apply_config)
+    mux_padding_enable = _BoolConfigDscr(ConfigCategory.mux, ApplyMode.apply_config)
+    mux_brutal_enable = _BoolConfigDscr(ConfigCategory.mux, ApplyMode.apply_config)
+    mux_brutal_up_mbps = _IntConfigDscr(ConfigCategory.mux, ApplyMode.apply_config)
+    mux_brutal_down_mbps = _IntConfigDscr(ConfigCategory.mux, ApplyMode.apply_config)
+
+    http_ports = _StrConfigDscr(ConfigCategory.http, ApplyMode.apply_config)
+    kcp_ports = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config)
+    kcp_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config)
+    decoy_domain = _StrConfigDscr(ConfigCategory.general, ApplyMode.apply_config, hide_in_virtual_child=True)
     # will be deprecated
-    proxy_path = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply, hide_in_virtual_child=True)
-    proxy_path_admin = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply, hide_in_virtual_child=True)
-    proxy_path_client = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply, hide_in_virtual_child=True)
-    firewall = _BoolConfigDscr(ConfigCategory.general, ApplyMode.apply, hide_in_virtual_child=True)
-    netdata = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply)  # removed
+    proxy_path = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config, hide_in_virtual_child=True)
+    proxy_path_admin = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
+    proxy_path_client = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
+    firewall = _BoolConfigDscr(ConfigCategory.general, ApplyMode.apply_config, hide_in_virtual_child=True)
+    netdata = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.reinstall)  # removed
     http_proxy_enable = _BoolConfigDscr(ConfigCategory.http)
-    block_iran_sites = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply, hide_in_virtual_child=True)
-    allow_invalid_sni = _BoolConfigDscr(ConfigCategory.tls, ApplyMode.apply, hide_in_virtual_child=True)
-    auto_update = _BoolConfigDscr(ConfigCategory.general, ApplyMode.apply, True, hide_in_virtual_child=True)
-    speed_test = _BoolConfigDscr(ConfigCategory.general, ApplyMode.apply, hide_in_virtual_child=True)
-    only_ipv4 = _BoolConfigDscr(ConfigCategory.general, ApplyMode.apply, hide_in_virtual_child=True)
+    block_iran_sites = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config, hide_in_virtual_child=True)
+    allow_invalid_sni = _BoolConfigDscr(ConfigCategory.tls, ApplyMode.apply_config, hide_in_virtual_child=True)
+    auto_update = _BoolConfigDscr(ConfigCategory.general, ApplyMode.apply_config, True, hide_in_virtual_child=True)
+    speed_test = _BoolConfigDscr(ConfigCategory.general, ApplyMode.reinstall, hide_in_virtual_child=True)
+    only_ipv4 = _BoolConfigDscr(ConfigCategory.general, ApplyMode.apply_config, hide_in_virtual_child=True)
 
-    shared_secret = _StrConfigDscr(ConfigCategory.proxies, ApplyMode.apply, hide_in_virtual_child=True)
+    shared_secret = _StrConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config, hide_in_virtual_child=True)
 
-    telegram_enable = _BoolConfigDscr(ConfigCategory.telegram, ApplyMode.restart)
+    telegram_enable = _BoolConfigDscr(ConfigCategory.telegram, ApplyMode.reinstall)
     # telegram_secret=auto()
-    telegram_adtag = _StrConfigDscr(ConfigCategory.telegram, ApplyMode.restart, hide_in_virtual_child=True)
-    telegram_lib = _StrConfigDscr(ConfigCategory.telegram, ApplyMode.restart, hide_in_virtual_child=True)
-    telegram_fakedomain = _StrConfigDscr(ConfigCategory.telegram, ApplyMode.restart, hide_in_virtual_child=True)
+    telegram_adtag = _StrConfigDscr(ConfigCategory.telegram, ApplyMode.reinstall, hide_in_virtual_child=True)
+    telegram_lib = _StrConfigDscr(ConfigCategory.telegram, ApplyMode.reinstall, hide_in_virtual_child=True)
+    telegram_fakedomain = _StrConfigDscr(ConfigCategory.telegram, ApplyMode.reinstall, hide_in_virtual_child=True)
 
-    v2ray_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply)
-    torrent_block = _BoolConfigDscr(ConfigCategory.general, ApplyMode.apply)
+    v2ray_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.reinstall)
+    torrent_block = _BoolConfigDscr(ConfigCategory.general, ApplyMode.apply_config)
 
-    tuic_enable = _BoolConfigDscr(ConfigCategory.tuic, ApplyMode.apply)
-    tuic_port = _StrConfigDscr(ConfigCategory.tuic, ApplyMode.apply, hide_in_virtual_child=True)
+    tuic_enable = _BoolConfigDscr(ConfigCategory.tuic, ApplyMode.apply_config)
+    tuic_port = _StrConfigDscr(ConfigCategory.tuic, ApplyMode.apply_config, hide_in_virtual_child=True)
 
     # the hysteria is refereing to hysteria2
-    hysteria_enable = _BoolConfigDscr(ConfigCategory.hysteria, ApplyMode.apply)
-    hysteria_port = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply, hide_in_virtual_child=True)
+    hysteria_enable = _BoolConfigDscr(ConfigCategory.hysteria, ApplyMode.apply_config)
+    hysteria_port = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config, hide_in_virtual_child=True)
     # if be enable hysteria2 will be use salamander as obfs
-    hysteria_obfs_enable = _BoolConfigDscr(ConfigCategory.hysteria, ApplyMode.apply)
-    hysteria_up_mbps = _StrConfigDscr(ConfigCategory.hysteria, ApplyMode.apply)
-    hysteria_down_mbps = _StrConfigDscr(ConfigCategory.hysteria, ApplyMode.apply)
-
-    shadowsocks2022_enable = _BoolConfigDscr(ConfigCategory.shadowsocks, ApplyMode.apply)
-    shadowsocks2022_method = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply)
-    shadowsocks2022_port = _StrConfigDscr(ConfigCategory.shadowsocks, ApplyMode.apply)
-    ssfaketls_enable = _BoolConfigDscr(ConfigCategory.shadowsocks, ApplyMode.restart)
-    ssfaketls_fakedomain = _StrConfigDscr(ConfigCategory.shadowsocks, ApplyMode.apply, hide_in_virtual_child=True)
-    shadowtls_enable = _BoolConfigDscr(ConfigCategory.shadowsocks, ApplyMode.apply)
-    shadowtls_fakedomain = _StrConfigDscr(ConfigCategory.shadowsocks, ApplyMode.apply, hide_in_virtual_child=True)
-
-    ssr_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply)
+    hysteria_obfs_enable = _BoolConfigDscr(ConfigCategory.hysteria, ApplyMode.apply_config)
+    hysteria_up_mbps = _StrConfigDscr(ConfigCategory.hysteria, ApplyMode.apply_config)
+    hysteria_down_mbps = _StrConfigDscr(ConfigCategory.hysteria, ApplyMode.apply_config)
+
+    shadowsocks2022_enable = _BoolConfigDscr(ConfigCategory.shadowsocks, ApplyMode.apply_config)
+    shadowsocks2022_method = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config)
+    shadowsocks2022_port = _StrConfigDscr(ConfigCategory.shadowsocks, ApplyMode.apply_config)
+    ssfaketls_enable = _BoolConfigDscr(ConfigCategory.shadowsocks, ApplyMode.reinstall)
+    ssfaketls_fakedomain = _StrConfigDscr(ConfigCategory.shadowsocks, ApplyMode.apply_config, hide_in_virtual_child=True)
+    shadowtls_enable = _BoolConfigDscr(ConfigCategory.shadowsocks, ApplyMode.apply_config)
+    shadowtls_fakedomain = _StrConfigDscr(ConfigCategory.shadowsocks, ApplyMode.apply_config, hide_in_virtual_child=True)
+
+    ssr_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config)
     # ssr_secret="ssr_secret"
-    ssr_fakedomain = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply)
+    ssr_fakedomain = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config)
 
-    vmess_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply)
+    vmess_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
     domain_fronting_domain = _StrConfigDscr(ConfigCategory.hidden)  # removed
-    domain_fronting_http_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply)  # removed
-    domain_fronting_tls_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply)  # removed
+    domain_fronting_http_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config)  # removed
+    domain_fronting_tls_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config)  # removed
 
-    ws_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply)
-    grpc_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply)
-    httpupgrade_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply)
-    splithttp_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply)
+    ws_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
+    grpc_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
+    httpupgrade_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
+    splithttp_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
 
-    vless_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply)
-    trojan_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply)
-    reality_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply)
-    tcp_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply)
-    quic_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply)
-    xtls_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply)
-    h2_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply)
+    vless_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
+    trojan_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
+    reality_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
+    tcp_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
+    quic_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config)
+    xtls_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config)
+    h2_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
 
-    db_version = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply)
-    last_priodic_usage_check = _IntConfigDscr(ConfigCategory.hidden, ApplyMode.apply)
+    db_version = _StrConfigDscr(ConfigCategory.hidden)
+    last_priodic_usage_check = _IntConfigDscr(ConfigCategory.hidden)
 
     branding_title = _StrConfigDscr(ConfigCategory.branding)
     branding_site = _StrConfigDscr(ConfigCategory.branding)
     branding_freetext = _StrConfigDscr(ConfigCategory.branding)
     not_found = _StrConfigDscr(ConfigCategory.hidden)
-    path_vmess = _StrConfigDscr(ConfigCategory.too_advanced, hide_in_virtual_child=True)
-    path_vless = _StrConfigDscr(ConfigCategory.too_advanced, hide_in_virtual_child=True)
-    path_trojan = _StrConfigDscr(ConfigCategory.too_advanced, hide_in_virtual_child=True)
-    path_v2ray = _StrConfigDscr(ConfigCategory.hidden, hide_in_virtual_child=True)  # deprecated
-    path_ss = _StrConfigDscr(ConfigCategory.hidden, hide_in_virtual_child=True)
-
-    path_splithttp = _StrConfigDscr(ConfigCategory.too_advanced, hide_in_virtual_child=True)
-    path_httpupgrade = _StrConfigDscr(ConfigCategory.too_advanced, hide_in_virtual_child=True)
-    path_ws = _StrConfigDscr(ConfigCategory.too_advanced, hide_in_virtual_child=True)
-    path_tcp = _StrConfigDscr(ConfigCategory.too_advanced, hide_in_virtual_child=True)
-    path_grpc = _StrConfigDscr(ConfigCategory.too_advanced, hide_in_virtual_child=True)
+    path_vmess = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
+    path_vless = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
+    path_trojan = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
+    path_v2ray = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config, hide_in_virtual_child=True)  # deprecated
+    path_ss = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config, hide_in_virtual_child=True)
+
+    path_splithttp = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
+    path_httpupgrade = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
+    path_ws = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
+    path_tcp = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
+    path_grpc = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
 
     # subs
     sub_full_singbox_enable = _BoolConfigDscr(ConfigCategory.hidden)
@@ -277,7 +277,7 @@ class ConfigEnum(metaclass=FastEnum):
     sub_full_clash_enable = _BoolConfigDscr(ConfigCategory.hidden)
     sub_full_clash_meta_enable = _BoolConfigDscr(ConfigCategory.hidden)
 
-    hiddifycli_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.restart)
+    hiddifycli_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.reinstall)
 
     @classmethod
     def __missing__(cls, value):

{hiddifypanel-10.50.5.dev0 → hiddifypanel-10.60.0.dev0}/hiddifypanel/panel/admin/Actions.py

@@ -108,7 +108,7 @@ class Actions(FlaskView):
         key = hutils.crypto.generate_x25519_keys()
         set_hconfig(ConfigEnum.reality_private_key, key['private_key'])
         set_hconfig(ConfigEnum.reality_public_key, key['public_key'])
-        hutils.flask.flash_config_success(restart_mode=ApplyMode.restart, domain_changed=False)
+        hutils.flask.flash_config_success(restart_mode=ApplyMode.apply_config, domain_changed=False)
         return redirect(hurl_for('admin.SettingAdmin:index'))
 
     @ login_required(roles={Role.super_admin})

{hiddifypanel-10.50.5.dev0 → hiddifypanel-10.60.0.dev0}/hiddifypanel/panel/admin/DomainAdmin.py

@@ -276,7 +276,7 @@ class DomainAdmin(AdminLTEModelView):
         old_db_domain = Domain.by_domain(model.domain)
         if is_created or not old_db_domain or old_db_domain.mode != model.mode:
             # return hiddify.reinstall_action(complete_install=False, domain_changed=True)
-            hutils.flask.flash_config_success(restart_mode=ApplyMode.apply, domain_changed=True)
+            hutils.flask.flash_config_success(restart_mode=ApplyMode.apply_config, domain_changed=True)
 
     # def after_model_change(self,form, model, is_created):
     #     if model.show_domains.count==0:
@@ -290,7 +290,7 @@ class DomainAdmin(AdminLTEModelView):
                 hutils.flask.flash(_('cf-delete.failed'), 'warning')  # type: ignore
         model.showed_by_domains = []
         # db.session.commit()
-        hutils.flask.flash_config_success(restart_mode=ApplyMode.apply, domain_changed=True)
+        hutils.flask.flash_config_success(restart_mode=ApplyMode.apply_config, domain_changed=True)
 
     def after_model_delete(self, model):
         if hutils.node.is_child():

{hiddifypanel-10.50.5.dev0 → hiddifypanel-10.60.0.dev0}/hiddifypanel/panel/admin/ProxyAdmin.py

@@ -60,7 +60,7 @@ class ProxyAdmin(FlaskView):
             hutils.proxy.get_proxies.invalidate_all()
             if hutils.node.is_child():
                 hutils.node.run_node_op_in_bg(hutils.node.child.sync_with_parent, *[hutils.node.child.SyncFields.proxies])
-            hutils.flask.flash_config_success(restart_mode=ApplyMode.apply, domain_changed=False)
+            hutils.flask.flash_config_success(restart_mode=ApplyMode.apply_config, domain_changed=False)
             global_config_form = get_global_config_form(True)
         else:
             hutils.flask.flash((_('config.validation-error')), 'danger')

{hiddifypanel-10.50.5.dev0 → hiddifypanel-10.60.0.dev0}/hiddifypanel/panel/admin/SettingAdmin.py

@@ -214,8 +214,8 @@ def get_config_form():
                     description=_(f"config.{c.key}.description"),
                     default=hconfig(c.key))
             elif c.key == ConfigEnum.country:
-                field = wtf.SelectField(_(f"config.{c.key}.label"), choices=[("ir", _("Iran")), ("zh", _(
-                    "China")), ("other", _("Others"))], description=_(f"config.{c.key}.description"), default=hconfig(c.key))
+                field = wtf.SelectField(_(f"config.{c.key}.label"), choices=[
+                    ("ir", _("Iran")), ("zh", _("China")), ("ru", _("Russia")), ("other", _("Others"))], description=_(f"config.{c.key}.description"), default=hconfig(c.key))
             elif c.key == ConfigEnum.package_mode:
                 package_modes = [("release", _("Release")), ("beta", _("Beta"))]
                 if hconfig(c.key) == "develop":