hiddifypanel 10.30.0.dev0__py3-none-any.whl → 10.30.0.dev2__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-10.30.0.dev0
+10.30.0.dev2

hiddifypanel/VERSION.py

@@ -1,3 +1,3 @@
-__version__='10.30.0.dev0'
+__version__='10.30.0.dev2'
 from datetime import datetime
-__release_date__= datetime.strptime('2024-06-24','%Y-%m-%d')
+__release_date__= datetime.strptime('2024-06-30','%Y-%m-%d')

hiddifypanel/base.py

@@ -18,18 +18,19 @@ from loguru import logger
 from hiddifypanel.panel.init_db import init_db
 
 
-def init_logger():
-    def dynamic_formatter(record) -> str:
-        fmt = '<green>{time:YYYY-MM-DD HH:mm:ss}</green> | <level>{level: <8}</level> | <cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>'
-        if record['extra']:
-            fmt += ' | <level>{extra}</level>'
-        return fmt + '\n'
+def logger_dynamic_formatter(record) -> str:
+    fmt = '<green>{time:YYYY-MM-DD HH:mm:ss}</green> | <level>{level: <8}</level> | <cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>'
+    if record['extra']:
+        fmt += ' | <level>{extra}</level>'
+    return fmt + '\n'
 
+
+def init_logger(app, cli):
     # configure logger
-    from hiddifypanel.models import ConfigEnum, hconfig
     logger.remove()
-    logger.add(sys.stderr, format=dynamic_formatter, level=hconfig(ConfigEnum.log_level), colorize=True, catch=True, enqueue=True, diagnose=False, backtrace=True)
-    # logger.trace('Logger initiated :)')
+    logger.add(sys.stderr if cli else sys.stdout, format=logger_dynamic_formatter, level=app.config['STDOUT_LOG_LEVEL'],
+               colorize=True, catch=True, enqueue=True, diagnose=False, backtrace=True)
+    logger.trace('Logger initiated :)')
 
 
 # TODO: refactor this function
@@ -86,20 +87,20 @@ def create_app(*args, cli=False, **config):
             v = True if v.lower() == "true" else (False if v.lower() == "false" else v)
 
         app.config[c] = v
-
+    init_logger(app, cli)
     hiddifypanel.database.init_app(app)
     with app.app_context():
         init_db()
-
-        init_logger()
+        logger.add(app.config['HIDDIFY_CONFIG_PATH'] + "/log/system/panel.log", format=logger_dynamic_formatter, level=hconfig(ConfigEnum.log_level),
+                   colorize=True, catch=True, enqueue=True, diagnose=False, backtrace=True)
 
     def get_locale():
         # Put your logic here. Application can store locale in
         # user profile, cookie, session, etc.
         if "admin" in request.base_url:
-            g.locale = auth.current_account.lang or hconfig(ConfigEnum.admin_lang) or 'fa'
+            g.locale = hconfig(ConfigEnum.admin_lang) or 'en'
         else:
-            g.locale = auth.current_account.lang or hconfig(ConfigEnum.lang) or 'fa'
+            g.locale = auth.current_account.lang or hconfig(ConfigEnum.lang) or 'en'
         return g.locale
     app.jinja_env.globals['get_locale'] = get_locale
     babel = Babel(app, locale_selector=get_locale)

hiddifypanel/models/config.py

@@ -9,11 +9,7 @@ from hiddifypanel.models.child import Child, ChildMode
 from sqlalchemy import Column, String, Boolean, Enum, ForeignKey, Integer
 from strenum import StrEnum
 from sqlalchemy_serializer import SerializerMixin
-
-
-def error(st):
-    from hiddifypanel.hutils.utils import error as err
-    err(st)
+from loguru import logger
 
 
 class BoolConfig(db.Model, SerializerMixin):
@@ -74,15 +70,15 @@ def hconfig(key: ConfigEnum, child_id: Optional[int] = None):  # -> str | int |
             if bool_conf:
                 value = bool_conf.value
             else:
-                error(f'bool {key} not found ')
+                logger.warning(f'bool {key} not found ')
         else:
             str_conf = StrConfig.query.filter(StrConfig.key == key, StrConfig.child_id == child_id).first()
             if str_conf:
                 value = str_conf.value
             else:
-                error(f'str {key} not found ')
+                logger.warning(f'str {key} not found ')
     except BaseException:
-        error(f'{key} error!')
+        logger.exception(f'{key} error!')
         raise
     if value != None:
         if key.type == int:
@@ -97,7 +93,6 @@ def set_hconfig(key: ConfigEnum, value: str | int | bool, child_id: int | None =
     if child_id is None:
         child_id = Child.current().id
 
-    print(f"chainging .... {key}---{value}---{child_id}---{commit}")
     if key.type == int and value != None:
         int(value)  # for testing int
 
@@ -127,7 +122,7 @@ def set_hconfig(key: ConfigEnum, value: str | int | bool, child_id: int | None =
         else:
             old_v = dbconf.value
     dbconf.value = value
-    error(f"changing {key} from {old_v} to {value}")
+    logger.trace(f"changing {key} from {old_v} to {value}")
     Events.config_changed.notify(conf=dbconf, old_value=old_v)
 
     if child_id == 0 and key.hide_in_virtual_child:
@@ -171,11 +166,9 @@ def add_or_update_config(commit: bool = True, child_id: int | None = None, overr
 def bulk_register_configs(hconfigs, commit: bool = True, froce_child_unique_id: str | None = None, override_unique_id: bool = True):
     from hiddifypanel.panel import hiddify
     for conf in hconfigs:
-        # print(conf)
         if conf['key'] == ConfigEnum.unique_id and not override_unique_id:
             continue
         child_id = hiddify.get_child(unique_id=froce_child_unique_id)
-        # print(conf, child_id, conf.get('child_unique_id', None), override_child_unique_id)
         add_or_update_config(commit=False, child_id=child_id, **conf)
     if commit:
         db.session.commit()

hiddifypanel/panel/admin/templates/model/proxydetail_list.html

@@ -0,0 +1,6 @@
+{% extends 'hiddify-flask-admin/list.html' %}
+
+{% block model_menu_bar %}
+{{ super() }}
+<a href="{{ url_for('flask.proxy.reset_proxies') }}" class="btn btn-primary">{{_('Reset Proxies')}}</a>
+{% endblock %}

hiddifypanel/panel/commercial/ProxyDetailsAdmin.py

@@ -7,12 +7,15 @@ from markupsafe import Markup
 from hiddifypanel.auth import login_required
 from flask_admin.actions import action
 from flask_admin.contrib.sqla import form, filters as sqla_filters, tools
+from flask_admin import expose
+
+
 # Define a custom field type for the related domains
 from hiddifypanel import hutils
 
 
 class ProxyDetailsAdmin(AdminLTEModelView):
-
+    list_template = 'model/proxydetail_list.html'
     column_hide_backrefs = True
     can_create = False
     form_excluded_columns = ['child', 'proto', 'transport', 'cdn']
@@ -20,6 +23,15 @@ class ProxyDetailsAdmin(AdminLTEModelView):
     column_searchable_list = ['name', 'proto', 'transport', 'l3', 'cdn']
     column_editable_list = ['name']
 
+    @expose('reset_proxies')
+    def reset_proxies(self):
+        from hiddifypanel.panel.init_db import get_proxy_rows_v1
+        from hiddifypanel.database import db
+        db.session.bulk_save_objects(get_proxy_rows_v1())
+        db.session.commit()
+        hutils.flask.flash((_('config.validation-success-no-reset')), 'success')  # type: ignore
+        return redirect("./")
+
     @action('disable', 'Disable', 'Are you sure you want to disable selected proxies?')
     def action_disable(self, ids):
         query = tools.get_query_for_ids(self.get_query(), self.model, ids)

hiddifypanel/panel/init_db.py

@@ -13,7 +13,7 @@ from hiddifypanel.panel import hiddify
 from hiddifypanel.database import db, db_execute
 from flask import g
 from sqlalchemy import text
-
+from loguru import logger
 MAX_DB_VERSION = 90
 
 
@@ -564,7 +564,6 @@ def add_config_if_not_exist(key: ConfigEnum, val: str | int, child_id: int | Non
         child_id = Child.current().id
 
     old_val = hconfig(key, child_id)
-    hutils.utils.error(f'{key}, {val}, {child_id}, {old_val}')
     if old_val is None:
         set_hconfig(key, val)
 
@@ -583,7 +582,7 @@ def execute(query: str):
 
         db_execute(query)
     except BaseException as e:
-        hutils.utils.error(e)
+        logger.debug(e)
         pass
 
 
@@ -599,7 +598,7 @@ def add_new_enum_values():
 
         # Get the existing values in the enum
         existing_values = [f'{e}' if isinstance(e, ConfigEnum) else e.value for e in enum_class]
-        # print("existing_values--------------", existing_values)
+
         # Get the values in the enum column in the database
         # result = db.engine.execute(f"SELECT DISTINCT `{column_name}` FROM {table_name}")
         # db_values = {row[0] for row in result}
@@ -616,7 +615,7 @@ def add_new_enum_values():
         # Find the new values that need to be added to the enum column in the database
         new_values = set(existing_values) - set(db_values)
         old_values = set(db_values) - set(existing_values)
-        # print('new_values-=-----------------', new_values)
+
         if len(new_values) == 0 and len(old_values) == 0:
             continue
 
@@ -642,14 +641,14 @@ def upgrade_database():
     if not os.path.isdir(backup_root) or len(os.listdir(backup_root)) == 0:
         if os.path.isfile(sqlite_db):
             os.rename(sqlite_db, sqlite_db + ".old")
-        hutils.utils.error("no backup found...")
+        logger.info("no backup found...")
         return
     if os.path.isfile(sqlite_db):
-        hutils.utils.error("Finding Old Version Database... importing configs from latest backup")
+        logger.info("Finding Old Version Database... importing configs from latest backup")
         newest_file = max([(f, os.path.getmtime(os.path.join(backup_root, f)))
                           for f in os.listdir(backup_root) if os.path.isfile(os.path.join(backup_root, f))], key=lambda x: x[1])[0]
         with open(f'{backup_root}{newest_file}', 'r') as f:
-            hutils.utils.error(f"importing configs from {newest_file}")
+            logger.info(f"importing configs from {newest_file}")
             json_data = json.load(f)
             hiddify.set_db_from_json(json_data,
                                      set_users=True,
@@ -667,7 +666,7 @@ def upgrade_database():
             os.rename(sqlite_db, sqlite_db + ".old")
             set_hconfig(ConfigEnum.db_version, db_version, commit=True)
 
-        hutils.utils.error("Upgrading to the new dataset succuess.")
+        logger.info("Upgrading to the new dataset succuess.")
 
 
 def init_db():
@@ -700,7 +699,7 @@ def init_db():
             if not db_action or (start_version == 0 and ver == 10):
                 continue
 
-            hutils.utils.error(f"Updating db from version {db_version} for node {child.id}")
+            logger.info(f"Updating db from version {db_version} for node {child.id}")
 
             if ver < 70:
                 if child.id != 0:
@@ -710,7 +709,7 @@ def init_db():
                 db_action(child.id)
 
             Events.db_init_event.notify(db_version=db_version)
-            hutils.utils.error(f"Updated successfuly db from version {db_version} to {ver}")
+            logger.info(f"Updated successfuly db from version {db_version} to {ver}")
 
             db_version = ver
             db.session.commit()

hiddifypanel/translations/en/LC_MESSAGES/messages.po

@@ -674,6 +674,9 @@ msgstr "Rename File"
 msgid "Reset Filters"
 msgstr "Reset Filters"
 
+msgid "Reset Proxies"
+msgstr "Reset Proxies"
+
 msgid "Reset Usage Time:"
 msgstr "Traffic usage reset time:"
 
@@ -1344,7 +1347,7 @@ msgstr ""
 "<a href='https://github.com/hiddify/hiddify-config/wiki/%D8%A7%D8%B3%D8%AA%D9%81%D8%A7%D8%AF%D9%87-%D8%A7%D8%B2-%D8%AF%D8%A7%D9%85%DB%8C%D9%86-%D9%81%D8%B1%D8%A7%D9%86%D8%AA%DB%8C%D9%86%DA%AF'>Guide</a>. ⚠️CloudFlare does not support Domain Fronting."
 
 msgid "config.domain_fronting.label"
-msgstr "🔒 Enable TLS Domain Fronting"
+msgstr "🔒 TLS Domain Fronting"
 
 msgid "config.domain_fronting_domain.description"
 msgstr ""
@@ -1358,7 +1361,7 @@ msgid "config.domain_fronting_http_enable.description"
 msgstr "Enabling HTTP Domain Fronting causes your domain to be block quickly."
 
 msgid "config.domain_fronting_http_enable.label"
-msgstr "Enable HTTP Domain Fronting"
+msgstr "HTTP Domain Fronting"
 
 msgid "config.domain_fronting_tls_enable.description"
 msgstr ""
@@ -1366,7 +1369,7 @@ msgstr ""
 " connect to CDN"
 
 msgid "config.domain_fronting_tls_enable.label"
-msgstr "🔒 Enable TLS Domain Fronting"
+msgstr "🔒 TLS Domain Fronting"
 
 msgid "config.firewall.description"
 msgstr ""
@@ -1394,13 +1397,13 @@ msgstr ""
 "framework. It can be used in supported CDNs"
 
 msgid "config.grpc_enable.label"
-msgstr "➿ Enable gRPC"
+msgstr "➿ gRPC"
 
 msgid "config.h2_enable.description"
 msgstr "Enable HTTP/2 Protocol"
 
 msgid "config.h2_enable.label"
-msgstr "🔵 Enable h2"
+msgstr "🔵 h2"
 
 msgid "config.hidden.description"
 msgstr "config.hidden.description"
@@ -1442,7 +1445,7 @@ msgstr ""
 "⚠️ <strong>Not Available in Xray based Clients. Only HiddifyNext, Singbox, and V2fly clients are supported.</strong>&nbsp;<a href=\"https://hiddify.com/manager/basic-concepts-and-troubleshooting/Basic-Concepts/#http-upgrade\" target=\"_blank\"><strong>(Read More)</strong></a></p>"
 
 msgid "config.httpupgrade_enable.label"
-msgstr "🆙 Enable HTTPUpgrade Method"
+msgstr "🆙 HTTPUpgrade Method"
 
 msgid "config.hysteria.description"
 msgstr ""
@@ -1463,7 +1466,7 @@ msgid "config.hysteria_enable.description"
 msgstr "To Enable UDP based Hysteria Protocol"
 
 msgid "config.hysteria_enable.label"
-msgstr "⚫️ Enable Hysteria2"
+msgstr "⚫️ Hysteria2"
 
 msgid "config.hysteria_obfs_enable.description"
 msgstr " Enables Hysteria Obfuscation (Salamander)"
@@ -1503,7 +1506,7 @@ msgid "config.kcp_enable.description"
 msgstr "It is a UDP Based Protocol "
 
 msgid "config.kcp_enable.label"
-msgstr "Enable KCP"
+msgstr "KCP"
 
 msgid "config.kcp_ports.description"
 msgstr ""
@@ -1574,7 +1577,7 @@ msgstr ""
 "target=\"_blank\">(Read More)</a></p>"
 
 msgid "config.mux_enable.label"
-msgstr "Ⓜ️ MUX Enable (⚠️ Incompatible With Some Clients)"
+msgstr "Ⓜ️ MUX (⚠️ Incompatible With Some Clients)"
 
 msgid "config.mux_max_connections.description"
 msgstr "Maximum Connections. Conflict with Max Streams"
@@ -1749,7 +1752,7 @@ msgid "config.quic_enable.description"
 msgstr "Enable QUIC Protocol"
 
 msgid "config.quic_enable.label"
-msgstr "🟡 Enable QUIC"
+msgstr "🟡 QUIC"
 
 msgid "config.reality.description"
 msgstr "REALITY eliminate the Server-Side TLS Fingerprint Feature"
@@ -1761,7 +1764,7 @@ msgid "config.reality_enable.description"
 msgstr "Enable Reality Protocol"
 
 msgid "config.reality_enable.label"
-msgstr "🔴 Enable Reality"
+msgstr "🔴 Reality"
 
 msgid "config.reality_fallback_domain.description"
 msgstr ""
@@ -1835,7 +1838,7 @@ msgstr ""
 "Inspection)"
 
 msgid "config.shadowsocks2022_enable.label"
-msgstr "⭕️ Enable Shadowsocks 2022"
+msgstr "⭕️ Shadowsocks 2022"
 
 msgid "config.shadowsocks2022_method.description"
 msgstr "This method also used in ShadowTLS and SSFakeTLS"
@@ -1934,7 +1937,7 @@ msgid "config.ssh_server_enable.description"
 msgstr "SSH Proxy is completely different than original SSH Server"
 
 msgid "config.ssh_server_enable.label"
-msgstr "✔️ Enable SSH Proxy"
+msgstr "✔️ SSH Proxy"
 
 msgid "config.ssh_server_port.description"
 msgstr ""
@@ -1965,7 +1968,7 @@ msgstr ""
 "accounting."
 
 msgid "config.ssr_enable.label"
-msgstr "Enable SSR"
+msgstr "SSR"
 
 msgid "config.ssr_fakedomain.description"
 msgstr ""
@@ -2006,10 +2009,14 @@ msgid "config.sub_full_singbox_enable.label"
 msgstr "config.sub_full_singbox_enable.label"
 
 msgid "config.sub_full_xray_json_enable.description"
-msgstr "config.sub_full_xray_json_enable.description"
+msgstr ""
+"XRay full link provides comprehensive configuration options for XRay-"
+"specific settings. This includes custom fragmentation and multiplexing (mux)"
+" in applications such as v2rayNG that support XRay protocols for fine-tuned "
+"control over XRay proxy setup."
 
 msgid "config.sub_full_xray_json_enable.label"
-msgstr "config.sub_full_xray_json_enable.label"
+msgstr "XRay Full Config Link"
 
 msgid "config.sub_singbox_ssh_enable.description"
 msgstr "config.sub_singbox_ssh_enable.description"
@@ -2021,13 +2028,13 @@ msgid "config.tcp_enable.description"
 msgstr "Enable TCP Protocol"
 
 msgid "config.tcp_enable.label"
-msgstr "🟠 Enable TCP"
+msgstr "🟠 TCP"
 
 msgid "config.telegram.description"
 msgstr "A proxy designed for Telegram to bypass Telegram filtering"
 
 msgid "config.telegram.label"
-msgstr "Telegram Proxy "
+msgstr "Telegram Configs"
 
 msgid "config.telegram_adtag.description"
 msgstr ""
@@ -2054,7 +2061,7 @@ msgstr ""
 "Domain</strong></span></p>"
 
 msgid "config.telegram_enable.label"
-msgstr "✔️ Enable Telegram MTProto"
+msgstr "✔️ Telegram MTProto"
 
 msgid "config.telegram_fakedomain.description"
 msgstr ""
@@ -2086,7 +2093,7 @@ msgstr ""
 "the-TLS-Trick-works-and-its-usage/\" target=\"_blank\">(Read More)</a></p>"
 
 msgid "config.tls_fragment_enable.label"
-msgstr "⏯ Enable TLS Fragment"
+msgstr "⏯ TLS Fragment"
 
 msgid "config.tls_fragment_size.description"
 msgstr "The Size of each Packet"
@@ -2104,7 +2111,7 @@ msgid "config.tls_mixed_case.description"
 msgstr "Enables TLS Mixed SNI Case Fragmentation"
 
 msgid "config.tls_mixed_case.label"
-msgstr "🔠 Enable TLS Mixed SNI Case"
+msgstr "🔠 TLS Mixed SNI Case"
 
 msgid "config.tls_padding_enable.description"
 msgstr ""
@@ -2114,7 +2121,7 @@ msgstr ""
 "More)</a></p>"
 
 msgid "config.tls_padding_enable.label"
-msgstr "♒️ Enable TLS Padding"
+msgstr "♒️ TLS Padding"
 
 msgid "config.tls_padding_length.description"
 msgstr "The length of the Padding for TLS Fragmentation"
@@ -2154,7 +2161,7 @@ msgid "config.trojan_enable.description"
 msgstr "Enable Trojan Protocol"
 
 msgid "config.trojan_enable.label"
-msgstr "🟤 Enable Trojan"
+msgstr "🟤 Trojan"
 
 msgid "config.tuic.description"
 msgstr ""
@@ -2169,7 +2176,7 @@ msgid "config.tuic_enable.description"
 msgstr "It is a UDP based protocol similar to QUIC"
 
 msgid "config.tuic_enable.label"
-msgstr "⚫️ Enable TUIC"
+msgstr "⚫️ TUIC"
 
 msgid "config.tuic_port.description"
 msgstr "Use comma to separate ports like ( 63000,60000 )"
@@ -2195,7 +2202,7 @@ msgid "config.v2ray_enable.description"
 msgstr "V2ray does not support accounting and not suggested"
 
 msgid "config.v2ray_enable.label"
-msgstr "♈️ Enable V2Ray "
+msgstr "♈️ V2Ray "
 
 msgid "config.validation-error"
 msgstr "There is an error in one of the fields."
@@ -2212,13 +2219,13 @@ msgid "config.vless_enable.description"
 msgstr "Enable VLess Protocol"
 
 msgid "config.vless_enable.label"
-msgstr "⚫️ Enable VLess"
+msgstr "⚫️ VLess"
 
 msgid "config.vmess_enable.description"
 msgstr "Active VMess Protocol"
 
 msgid "config.vmess_enable.label"
-msgstr "🟣 Enable VMess"
+msgstr "🟣 VMess"
 
 msgid "config.warp-https-domain-for-warp-site"
 msgstr "config.warp-https-domain-for-warp-site"
@@ -2238,7 +2245,7 @@ msgstr ""
 "server IP "
 
 msgid "config.warp_enable.label"
-msgstr "Enable WARP+"
+msgstr "WARP+"
 
 msgid "config.warp_mode.description"
 msgstr ""
@@ -2283,7 +2290,7 @@ msgstr ""
 "Next</a>)</p>"
 
 msgid "config.wireguard_enable.label"
-msgstr "🐉 Enable WireGuard"
+msgstr "🐉 WireGuard"
 
 msgid "config.wireguard_ipv4.description"
 msgstr "-"
@@ -2327,13 +2334,13 @@ msgid "config.ws_enable.description"
 msgstr "Websocket creates a tunnel over HTTP that is useful to be used in CDN"
 
 msgid "config.ws_enable.label"
-msgstr "🔰 Enable Websocket"
+msgstr "🔰 Websocket"
 
 msgid "config.xtls_enable.description"
 msgstr "Enable XTLS Protocol"
 
 msgid "config.xtls_enable.label"
-msgstr "🟢 Enable XTLS"
+msgstr "🟢 XTLS"
 
 msgid "config.invalid uuid"
 msgstr ""
@@ -2374,7 +2381,7 @@ msgstr ""
 "<a href='https://github.com/hiddify/hiddify-config/wiki/Guide-for-domain-fronting'>Guide</a>. ⚠️CloudFlare does not support Domain Fronting."
 
 msgid "domain.domain_fronting.label"
-msgstr "🔒 Enable TLS Domain Fronting"
+msgstr "🔒 TLS Domain Fronting"
 
 msgid "domain.ip"
 msgstr "IP"
@@ -2407,13 +2414,13 @@ msgid "items"
 msgstr "items"
 
 msgid "lang.en"
-msgstr "🇺🇸 English - Английский"
+msgstr "🇺🇸 English - انگلیسی"
 
 msgid "lang.fa"
 msgstr "🇮🇷 Persian - فارسی"
 
 msgid "lang.pt"
-msgstr "🇵🇹 Portuguese - پرتغالی"
+msgstr "🇵🇹 Portuguese"
 
 msgid "lang.ru"
 msgstr "🇷🇺 Russian - Русский"