hiddifypanel 9.0.0.dev92__tar.gz → 10.7.0.dev94__tar.gz

{hiddifypanel-9.0.0.dev92 → hiddifypanel-10.7.0.dev94}/HISTORY.md

@@ -281,6 +281,10 @@
 
 #### Fix
 
+* Custom usage trojan. 
+
+* Setting telegram web hook. 
+
 * Bug. 
 
 * Csrf check. 
@@ -917,6 +921,15 @@ with A2_
 
 #### Other
 
+* Makeing unified version. 
+
+* Disable changing proxy details. 
+
+* Merge pull request #147 from Iam54r1n4/fix-tg-bot. 
+  _Fix setting telegram web hook_
+
+* Reformat. 
+
 * Disable csrf globally. 
 
 * Merge pull request #145 from Iam54r1n4/up-trans. 

{hiddifypanel-9.0.0.dev92 → hiddifypanel-10.7.0.dev94}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 9.0.0.dev92
+Version: 10.7.0.dev94
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-manager/
 Author: hiddify

hiddifypanel-10.7.0.dev94/hiddifypanel/VERSION

@@ -0,0 +1 @@
+10.7.0.dev94

hiddifypanel-10.7.0.dev94/hiddifypanel/VERSION.py

@@ -0,0 +1,3 @@
+__version__='10.7.0.dev94'
+from datetime import datetime
+__release_date__= datetime.strptime('2024-03-04','%Y-%m-%d')

{hiddifypanel-9.0.0.dev92 → hiddifypanel-10.7.0.dev94}/hiddifypanel/hutils/flask.py

@@ -1,5 +1,6 @@
 from typing import List
 from flask import current_app, flash as flask_flash, g, request
+from wtforms.validators import ValidationError
 from apiflask import abort as apiflask_abort
 from flask_babel import lazy_gettext as _
 from flask import url_for, Markup  # type: ignore
@@ -7,8 +8,10 @@ from urllib.parse import urlparse
 import user_agents
 import re
 import os
+
 from hiddifypanel.cache import cache
 from hiddifypanel.models import *
+from hiddifypanel import hutils
 
 
 def flash(message: str, category: str = "message"):
@@ -218,6 +221,18 @@ def proxy_path_validator(proxy_path: str) -> None:
 
 def list_dir_files(dir_path: str) -> List[str]:
     return [f for f in os.listdir(dir_path) if os.path.isfile(os.path.join(dir_path, f))]
+
+def validate_domain_exist(form, field):
+    domain = field.data
+    if not domain:
+        return
+    dip = hutils.network.get_domain_ip(domain)
+    if dip is None:
+        raise ValidationError(
+            _("Domain can not be resolved! there is a problem in your domain")) # type: ignore
+
+
+
 # region not used
 
 

{hiddifypanel-9.0.0.dev92 → hiddifypanel-10.7.0.dev94}/hiddifypanel/panel/admin/QuickSetup.py

@@ -8,7 +8,6 @@ import wtforms as wtf
 from flask_wtf import FlaskForm
 from flask_bootstrap import SwitchField
 from hiddifypanel.panel import hiddify
-from wtforms.fields import *
 from flask_classful import FlaskView
 from wtforms.validators import ValidationError
 # from gettext import gettext as _
@@ -61,7 +60,7 @@ class QuickSetup(FlaskView):
             Domain.query.filter(Domain.domain == f'{hutils.network.get_ip_str(4)}.sslip.io').delete()
             db.session.add(Domain(domain=quick_form.domain.data.lower(), mode=DomainType.direct))
             set_hconfig(ConfigEnum.block_iran_sites, quick_form.block_iran_sites.data)
-            set_hconfig(ConfigEnum.decoy_domain,quick_form.decoy_domain.data)
+            set_hconfig(ConfigEnum.decoy_domain, quick_form.decoy_domain.data)
             # hiddify.bulk_register_configs([
             #     # {"key": ConfigEnum.telegram_enable, "value": quick_form.enable_telegram.data == True},
             #     # {"key": ConfigEnum.vmess_enable, "value": quick_form.enable_vmess.data == True},
@@ -84,12 +83,16 @@ class QuickSetup(FlaskView):
 
 def get_lang_form(empty=False):
     class LangForm(FlaskForm):
-        admin_lang = wtf.fields.SelectField(_("config.admin_lang.label"), choices=[("en", _("lang.en")), ("fa", _("lang.fa")), ("pt", _(
-            "lang.pt")), ("zh", _("lang.zh")), ("ru", _("lang.ru"))], description=_("config.admin_lang.description"), default=hconfig(ConfigEnum.admin_lang))
-        # lang=wtf.fields.SelectField(_("config.lang.label"),choices=[("en",_("lang.en")),("fa",_("lang.fa"))],description=_("config.lang.description"),default=hconfig(ConfigEnum.lang))
-        country = wtf.fields.SelectField(_("config.country.label"), choices=[("ir", _("Iran")), ("zh", _(
-            "China")), ("other", "Others")], description=_("config.country.description"), default=hconfig(ConfigEnum.country))
-        lang_submit = wtf.fields.SubmitField(_('Submit'))
+        admin_lang = wtf.SelectField(
+            _("config.admin_lang.label"), choices=[("en", _("lang.en")), ("fa", _("lang.fa")), ("pt", _("lang.pt")), ("zh", _("lang.zh")), ("ru", _("lang.ru"))],
+            description=_("config.admin_lang.description"),
+            default=hconfig(ConfigEnum.admin_lang))
+        # lang=wtf.SelectField(_("config.lang.label"),choices=[("en",_("lang.en")),("fa",_("lang.fa"))],description=_("config.lang.description"),default=hconfig(ConfigEnum.lang))
+        country = wtf.SelectField(
+            _("config.country.label"), choices=[("ir", _("Iran")), ("zh", _("China")), ("other", "Others")],
+            description=_("config.country.description"),
+            default=hconfig(ConfigEnum.country))
+        lang_submit = wtf.SubmitField(_('Submit'))
 
     return LangForm(None)if empty else LangForm()
 
@@ -108,13 +111,12 @@ def get_quick_setup_form(empty=False):
     class QuickSetupForm(FlaskForm):
         domain_regex = "^([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})$"
 
-        domain_validators = [wtf.validators.Regexp(domain_regex, re.IGNORECASE, _("config.Invalid domain")),
-                             validate_domain,
-                             wtf.validators.NoneOf([d.domain.lower() for d in Domain.query.all()], _("config.Domain already used")),
-                             wtf.validators.NoneOf([c.value.lower() for c in StrConfig.query.all() if "fakedomain" in c.key and c.key !=
-                                                   ConfigEnum.decoy_domain], _("config.Domain already used"))
-                             ]
-        domain = wtf.fields.StringField(
+        domain_validators = [
+            wtf.validators.Regexp(domain_regex, re.IGNORECASE, _("config.Invalid domain")),
+            validate_domain,
+            wtf.validators.NoneOf([d.domain.lower() for d in Domain.query.all()], _("config.Domain already used")),
+            wtf.validators.NoneOf([c.value.lower() for c in StrConfig.query.all() if "fakedomain" in c.key and c.key != ConfigEnum.decoy_domain], _("config.Domain already used"))]
+        domain = wtf.StringField(
             _("domain.domain"),
             domain_validators,
             description=_("domain.description"),
@@ -129,9 +131,9 @@ def get_quick_setup_form(empty=False):
         block_iran_sites = SwitchField(_("config.block_iran_sites.label"), description=_(
             "config.block_iran_sites.description"), default=hconfig(ConfigEnum.block_iran_sites))
         # enable_vmess = SwitchField(_("config.vmess_enable.label"), description=_("config.vmess_enable.description"), default=hconfig(ConfigEnum.vmess_enable))
-        decoy_domain = wtf.fields.StringField(_("config.decoy_domain.label"), description=_("config.decoy_domain.description"), default=hconfig(
-            ConfigEnum.decoy_domain), validators=[wtf.validators.Regexp(domain_regex, re.IGNORECASE, _("config.Invalid domain")), hiddify.validate_domain_exist])
-        submit = wtf.fields.SubmitField(_('Submit'))
+        decoy_domain = wtf.StringField(_("config.decoy_domain.label"), description=_("config.decoy_domain.description"), default=hconfig(
+            ConfigEnum.decoy_domain), validators=[wtf.validators.Regexp(domain_regex, re.IGNORECASE, _("config.Invalid domain")), hutils.flask.validate_domain_exist])
+        submit = wtf.SubmitField(_('Submit'))
 
     return QuickSetupForm(None) if empty else QuickSetupForm()
 
@@ -144,8 +146,7 @@ def validate_domain(form, field):
 
     myip = hutils.network.get_ip(4)
     if dip and myip != dip:
-        raise ValidationError(_("Domain (%(domain)s)-> IP=%(domain_ip)s is not matched with your ip=%(server_ip)s which is required in direct mode",
-                              server_ip=myip, domain_ip=dip, domain=domain))
+        raise ValidationError(_("Domain (%(domain)s)-> IP=%(domain_ip)s is not matched with your ip=%(server_ip)s which is required in direct mode", server_ip=myip, domain_ip=dip, domain=domain))
 
 
 def admin_link():

{hiddifypanel-9.0.0.dev92 → hiddifypanel-10.7.0.dev94}/hiddifypanel/panel/admin/SettingAdmin.py

@@ -13,7 +13,6 @@ from flask_bootstrap import SwitchField
 
 # from gettext import gettext as _
 from flask_classful import FlaskView
-from wtforms.fields import *
 from flask_wtf import FlaskForm
 
 
@@ -81,7 +80,7 @@ class SettingAdmin(FlaskView):
             flask_babel.refresh()
 
             from hiddifypanel.panel.commercial.telegrambot import register_bot
-            register_bot()
+            register_bot(set_hook=True)
             # if hconfig(ConfigEnum.parent_panel):
             #     hiddify_api.sync_child_to_parent()
             reset_action = hiddify.check_need_reset(old_configs)
@@ -146,7 +145,7 @@ def get_config_form():
             continue
 
         class CategoryForm(FlaskForm):
-            description_for_fieldset = wtf.fields.TextAreaField("", description=_(f'config.{cat}.description'), render_kw={"class": "d-none"})
+            description_for_fieldset = wtf.TextAreaField("", description=_(f'config.{cat}.description'), render_kw={"class": "d-none"})
         for c2 in cat_configs:
             if not (c2 in configs_key):
                 continue
@@ -155,102 +154,96 @@ def get_config_form():
             if c.key in bool_types:
                 field = SwitchField(_(f'config.{c.key}.label'), default=c.value, description=_(f'config.{c.key}.description'))
             elif c.key == ConfigEnum.core_type:
-                field = wtf.fields.SelectField(_(f"config.{c.key}.label"), choices=[("xray", _("Xray")), ("singbox", _(
-                    "SingBox"))], description=_(f"config.{c.key}.description"), default=hconfig(c.key))
+                field = wtf.SelectField(_(f"config.{c.key}.label"), choices=[("xray", _("Xray")), ("singbox", _("SingBox"))], description=_(f"config.{c.key}.description"), default=hconfig(c.key))
             elif c.key == ConfigEnum.warp_mode:
-                field = wtf.fields.SelectField(_(f"config.{c.key}.label"), choices=[("disable", _("Disable")), ("all", _("All")), ("custom", _(
-                    "Only Blocked and Local websites"))], description=_(f"config.{c.key}.description"), default=hconfig(c.key))
+                field = wtf.SelectField(
+                    _(f"config.{c.key}.label"), choices=[("disable", _("Disable")), ("all", _("All")), ("custom", _("Only Blocked and Local websites"))],
+                    description=_(f"config.{c.key}.description"),
+                    default=hconfig(c.key))
 
             elif c.key == ConfigEnum.lang or c.key == ConfigEnum.admin_lang:
-                field = wtf.fields.SelectField(_(f"config.{c.key}.label"), choices=[("en", _("lang.en")), ("fa", Markup(_("lang.fa"))), ("zh", _(
-                    "lang.zh")), ("pt", _("lang.pt")), ("ru", _("lang.ru"))], description=_(f"config.{c.key}.description"), default=hconfig(c.key))
+                field = wtf.SelectField(
+                    _(f"config.{c.key}.label"),
+                    choices=[("en", _("lang.en")), ("fa", Markup(_("lang.fa"))), ("zh", _("lang.zh")), ("pt", _("lang.pt")), ("ru", _("lang.ru"))],
+                    description=_(f"config.{c.key}.description"),
+                    default=hconfig(c.key))
             elif c.key == ConfigEnum.country:
-                field = wtf.fields.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")), ("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":
                     package_modes.append(("develop", _("Develop")))
-                field = wtf.fields.SelectField(_(f"config.{c.key}.label"), choices=package_modes,
-                                               description=_(f"config.{c.key}.description"), default=hconfig(c.key))
+                field = wtf.SelectField(_(f"config.{c.key}.label"), choices=package_modes, description=_(f"config.{c.key}.description"), default=hconfig(c.key))
 
             elif c.key == ConfigEnum.shadowsocks2022_method:
-                field = wtf.fields.SelectField(_(f"config.{c.key}.label"), choices=[
-                    ("2022-blake3-aes-256-gcm", "2022-blake3-aes-256-gcm"),
-                    ("2022-blake3-chacha20-poly1305", "2022-blake3-chacha20-poly1305"),
-                ], description=_(f"config.{c.key}.description"), default=hconfig(c.key))
+                field = wtf.SelectField(
+                    _(f"config.{c.key}.label"),
+                    choices=[("2022-blake3-aes-256-gcm", "2022-blake3-aes-256-gcm"), ("2022-blake3-chacha20-poly1305", "2022-blake3-chacha20-poly1305"),],
+                    description=_(f"config.{c.key}.description"), default=hconfig(c.key))
 
             elif c.key == ConfigEnum.utls:
-                field = wtf.fields.SelectField(
+                field = wtf.SelectField(
                     _(f"config.{c.key}.label"),
-                    choices=[("none", "None"),
-                             ("chrome", "Chrome"),
-                             ("edge", "Edge"),
-                             ("ios", "iOS"),
-                             ("android", "Android"),
-                             ("safari", "Safari"),
-                             ("firefox", "Firefox"),
-                             ('random', 'random'),
-                             ('randomized', 'randomized')],
+                    choices=[
+                        ("none", "None"), ("chrome", "Chrome"), ("edge", "Edge"), ("ios", "iOS"), ("android", "Android"),
+                        ("safari", "Safari"), ("firefox", "Firefox"), ('random', 'random'), ('randomized', 'randomized')],
                     description=_(f"config.{c.key}.description"),
-                    default=hconfig(c.key))
+                    default=hconfig(c.key)
+                )
             elif c.key == ConfigEnum.telegram_lib:
                 # if hconfig(ConfigEnum.telegram_lib)=='python':
                 #     continue6
                 libs = [("python", _("lib.telegram.python")), ("tgo", _("lib.telegram.go")),
                         ("orig", _("lib.telegram.orignal")), ("erlang", _("lib.telegram.erlang"))]
-                field = wtf.fields.SelectField(_("config.telegram_lib.label"), choices=libs, description=_(
-                    "config.telegram_lib.description"), default=hconfig(ConfigEnum.telegram_lib))
+                field = wtf.SelectField(_("config.telegram_lib.label"), choices=libs, description=_("config.telegram_lib.description"), default=hconfig(ConfigEnum.telegram_lib))
             elif c.key == ConfigEnum.mux_protocol:
                 choices = [("smux", 'smux'), ("yamux", "yamux"), ("h2mux", "h2mux")]
-                field = wtf.fields.SelectField(_(f"config.{c.key}.label"), choices=choices,
-                                               description=_(f"config.{c.key}.description"), default=hconfig(c.key))
+                field = wtf.SelectField(_(f"config.{c.key}.label"), choices=choices, description=_(f"config.{c.key}.description"), default=hconfig(c.key))
 
             elif c.key == ConfigEnum.warp_sites:
                 validators = [wtf.validators.Length(max=2048)]
                 render_kw = {'class': "ltr", 'maxlength': 2048}
-                field = wtf.fields.TextAreaField(_(f'config.{c.key}.label'), validators, default=c.value,
-                                                 description=_(f'config.{c.key}.description'), render_kw=render_kw)
+                field = wtf.TextAreaField(_(f'config.{c.key}.label'), validators, default=c.value, description=_(f'config.{c.key}.description'), render_kw=render_kw)
             elif c.key == ConfigEnum.branding_freetext:
                 validators = [wtf.validators.Length(max=2048)]
                 render_kw = {'class': "ltr", 'maxlength': 2048}
-                field = custom_widgets.CKTextAreaField(_(f'config.{c.key}.label'), validators, default=c.value,
-                                                       description=_(f'config.{c.key}.description'), render_kw=render_kw)
+                field = custom_widgets.CKTextAreaField(_(f'config.{c.key}.label'), validators, default=c.value, description=_(f'config.{c.key}.description'), render_kw=render_kw)
             else:
                 render_kw = {'class': "ltr"}
                 validators = []
                 if c.key == ConfigEnum.domain_fronting_domain:
                     validators.append(wtf.validators.Regexp("^([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})|$", re.IGNORECASE, _("config.Invalid domain")))
-                    validators.append(hiddify.validate_domain_exist)
+                    validators.append(hutils.flask.validate_domain_exist)
                 elif '_domain' in c.key or "_fakedomain" in c.key:
                     validators.append(wtf.validators.Regexp("^([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})$", re.IGNORECASE, _("config.Invalid domain")))
-                    validators.append(hiddify.validate_domain_exist)
+                    validators.append(hutils.flask.validate_domain_exist)
 
                     if c.key != ConfigEnum.decoy_domain:
                         validators.append(wtf.validators.NoneOf([d.domain.lower() for d in Domain.query.all()], _("config.Domain already used")))
-                        validators.append(wtf.validators.NoneOf([cc.value.lower() for cc in StrConfig.query.filter(StrConfig.child_id == Child.current.id).all(
-                        ) if cc.key != c.key and "fakedomain" in cc.key and cc.key != ConfigEnum.decoy_domain], _("config.Domain already used")))
+                        validators.append(wtf.validators.NoneOf(
+                            [cc.value.lower() for cc in StrConfig.query.filter(StrConfig.child_id == Child.current.id).all() if cc.key != c.key and "fakedomain" in cc.key and cc.key != ConfigEnum.decoy_domain], _("config.Domain already used")))
+
                     render_kw['required'] = ""
                     if len(c.value) < 3:
                         c.value = hutils.network.get_random_domains(1)[0]
+
                 # if c.key ==ConfigEnum.reality_short_ids:
                 #     extra_info=f" <a target='_blank' href='{hurl_for('admin.Actions:get_some_random_reality_friendly_domain',test_domain=c.value)}'>"+_('Example Domains')+"</a>"
                 # if c.key ==ConfigEnum.reality_server_names:
                 #     validators.append(wtf.validators.Regexp("^([\w-]+\.)+[\w-]+(,\s*([\w-]+\.)+[\w-]+)*$",re.IGNORECASE,_("Invalid REALITY hostnames")))
                     # gauge width gate lamp weasel jaguar minute enough few attitude endorse situate usdt trc20 doge bep20 trx doge ltc bnb eth btc bnb
                     # enjoy control list debris chronic few door broken way negative daring life season recipe profit switch bitter casual frame aunt plate brush aerobic display
+
                 if c.key == ConfigEnum.parent_panel:
                     validators.append(wtf.validators.Regexp("()|(http(s|)://([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})/.*)", re.IGNORECASE, _("Invalid admin link")))
                 if c.key == ConfigEnum.telegram_bot_token:
                     validators.append(wtf.validators.Regexp("()|^([0-9]{8,12}:[a-zA-Z0-9_-]{30,40})|$", re.IGNORECASE, _("config.Invalid telegram bot token")))
                 if c.key == ConfigEnum.branding_site:
-                    validators.append(wtf.validators.Regexp(
-                        "()|(http(s|)://([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})/?.*)", re.IGNORECASE, _("config.Invalid brand link")))
+                    validators.append(wtf.validators.Regexp("()|(http(s|)://([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})/?.*)", re.IGNORECASE, _("config.Invalid brand link")))
                     # render_kw['required']=""
 
                 if 'secret' in c.key:
-                    validators.append(wtf.validators.Regexp(
-                        "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$", re.IGNORECASE, _('config.invalid uuid')))
+                    validators.append(wtf.validators.Regexp("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$", re.IGNORECASE, _('config.invalid uuid')))
                     render_kw['required'] = ""
 
                 if c.key == ConfigEnum.proxy_path:
@@ -272,20 +265,22 @@ def get_config_form():
                 if c.key in [ConfigEnum.hysteria_up_mbps, ConfigEnum.hysteria_down_mbps, ConfigEnum.mux_max_connections, ConfigEnum.mux_min_streams, ConfigEnum.mux_max_streams,
                              ConfigEnum.mux_brutal_down_mbps, ConfigEnum.mux_brutal_up_mbps]:
                     validators.append(wtf.validators.Regexp("^\\d+$", re.IGNORECASE, _("config.Invalid! it should be a number only") + f' {c.key}'))
+
                 for val in validators:
                     if hasattr(val, "regex"):
                         render_kw['pattern'] = val.regex.pattern
                         render_kw['title'] = val.message
+
                 if c.key == ConfigEnum.reality_public_key and g.account.mode in [AdminMode.super_admin]:
                     extra_info = f" <a href='{hurl_for('admin.Actions:change_reality_keys')}'>{_('Change')}</a>"
-                field = wtf.fields.StringField(_(f'config.{c.key}.label'), validators, default=c.value,
-                                               description=_(f'config.{c.key}.description') + extra_info, render_kw=render_kw)
+
+                field = wtf.StringField(_(f'config.{c.key}.label'), validators, default=c.value, description=_(f'config.{c.key}.description') + extra_info, render_kw=render_kw)
             setattr(CategoryForm, f'{c.key}', field)
 
-        multifield = wtf.fields.FormField(CategoryForm, Markup('<i class="fa-solid fa-plus"></i>&nbsp' + _(f'config.{cat}.label')))
+        multifield = wtf.FormField(CategoryForm, Markup('<i class="fa-solid fa-plus"></i>&nbsp' + _(f'config.{cat}.label')))
 
         setattr(DynamicForm, cat, multifield)
 
-    setattr(DynamicForm, "submit", wtf.fields.SubmitField(_('Submit')))
+    setattr(DynamicForm, "submit", wtf.SubmitField(_('Submit')))
 
     return DynamicForm()

{hiddifypanel-9.0.0.dev92 → hiddifypanel-10.7.0.dev94}/hiddifypanel/panel/commercial/ProxyDetailsAdmin.py

@@ -18,7 +18,7 @@ class ProxyDetailsAdmin(AdminLTEModelView):
 
     column_hide_backrefs = True
     can_create = False
-    form_excluded_columns = ['child']
+    form_excluded_columns = ['child', 'proto', 'transport', 'l3', 'cdn']
     column_exclude_list = ['child']
     column_searchable_list = ['name', 'proto', 'transport', 'l3', 'cdn']
     column_editable_list = ['name']

{hiddifypanel-9.0.0.dev92 → hiddifypanel-10.7.0.dev94}/hiddifypanel/panel/commercial/restapi/v1/__init__.py

@@ -10,7 +10,7 @@ from . import tgbot
 from .tgmsg import SendMsgResource
 from .resources import *
 bp = APIBlueprint("api_v1", __name__, url_prefix="/<proxy_path>/api/v1/", tag="api_v1", enable_openapi=False)
-bp_uuid = APIBlueprint("api_v1_uuid", __name__, url_prefix="/<proxy_path>/<uuid:secret_uuid>/api/v1", template_folder="templates", enable_openapi=False)
+bp_uuid = APIBlueprint("api_v1_uuid", __name__, url_prefix="/<proxy_path>/<uuid:secret_uuid>/api/v1/", template_folder="templates", enable_openapi=False)
 api = Api(bp)
 api_uuid = Api(bp_uuid)
 

{hiddifypanel-9.0.0.dev92 → hiddifypanel-10.7.0.dev94}/hiddifypanel/panel/commercial/restapi/v1/tgbot.py

@@ -34,7 +34,7 @@ def register_bot(set_hook=False):
 
             user_secret = AdminUser.get_super_admin_uuid()
             if set_hook:
-                bot.set_webhook(url=f"https://{domain}/{admin_proxy_path}/{user_secret}/api/v1/tgbot/",)
+                bot.set_webhook(url=f"https://{domain}/{admin_proxy_path}/{user_secret}/api/v1/tgbot/")
     except Exception as e:
         print(e)
         import traceback

{hiddifypanel-9.0.0.dev92 → hiddifypanel-10.7.0.dev94}/hiddifypanel/panel/hiddify.py

@@ -8,7 +8,6 @@ from typing import Tuple
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import x25519
 from flask import current_app, g
-from wtforms.validators import ValidationError
 from flask_babel import lazy_gettext as _
 from flask_babel import gettext as __
 from datetime import timedelta
@@ -164,16 +163,6 @@ def get_html_user_link(model: BaseAccount, domain: Domain):
     return res
 
 
-def validate_domain_exist(form, field):
-    domain = field.data
-    if not domain:
-        return
-    dip = hutils.network.get_domain_ip(domain)
-    if dip is None:
-        raise ValidationError(
-            _("Domain can not be resolved! there is a problem in your domain"))
-
-
 def reinstall_action(complete_install=False, domain_changed=False, do_update=False):
     from hiddifypanel.panel.admin.Actions import Actions
     action = Actions()

{hiddifypanel-9.0.0.dev92 → hiddifypanel-10.7.0.dev94}/hiddifypanel/panel/user/link_maker.py

@@ -978,9 +978,9 @@ def make_v2ray_configs(user, user_activate, domains, expire_days, ip_debug, db_d
 
             name = '⏳' if user_activate else '✖'
             if user.usage_limit_GB < 1000:
-                name += f'{round(user.current_usage_GB,3)}/{str(user.usage_limit_GB).rstrip(".0")}GB'
+                name += f'{round(user.current_usage_GB,3)}/{str(user.usage_limit_GB).replace(".0","")}GB'
             elif user.usage_limit_GB < 100000:
-                name += f'{round(user.current_usage_GB/1000,3)}/{str(round(user.usage_limit_GB/1000,1)).rstrip(".0")}TB'
+                name += f'{round(user.current_usage_GB/1000,3)}/{str(round(user.usage_limit_GB/1000,1)).replace(".0","")}TB'
             else:
                 res.append("#No Usage Limit")
             if expire_days < 1000:

{hiddifypanel-9.0.0.dev92 → hiddifypanel-10.7.0.dev94}/hiddifypanel/translations.i18n/en.json

@@ -607,10 +607,10 @@
       "description": "Shadowsocks is a fast tunnel proxy that helps you bypass firewalls."
     }
   },
+  "Domain can not be resolved! there is a problem in your domain": "Domain can not be resolved! There is a problem in your domain. Please check your Domain configurations.",
   "Error! auto cdn ip can not be find, please contact admin.": "Error In Auto CDN IP! It Can Not Be Find, Please Contact Admin",
   "Owner can not be deleted!": "Owner can not be deleted!",
   "This domain does not exist in the panel!": "This Domain does not exist in the Panel !",
-  "Domain can not be resolved! there is a problem in your domain": "Domain can not be resolved! There is a problem in your domain. Please check your Domain configurations.",
   "selected domain for REALITY is not in the same ASN. To better use of the protocol, it is better to find a domain in the same ASN.": "Selected Domain for REALITY is not in the same ASN. To better use of the Protocol, it is better to find a Domain in the same ASN",
   "User activated!": "User Activated",
   "Package ended!": "Package Ended",

{hiddifypanel-9.0.0.dev92 → hiddifypanel-10.7.0.dev94}/hiddifypanel/translations.i18n/fa.json

@@ -607,10 +607,10 @@
       "description": "Shadowsocks یک پروکسی تونل سریع است که به شما کمک می کند فایروال ها را دور بزنید."
     }
   },
+  "Domain can not be resolved! there is a problem in your domain": "دامنه قابل دسترسی نیست! در دامنه شما مشکلی وجود دارد.",
   "Error! auto cdn ip can not be find, please contact admin.": "خطا! آی پی اتوماتیک نتوانست پیدا شود. لطفا با مدیر تماس بگیرید",
   "Owner can not be deleted!": "",
   "This domain does not exist in the panel!": "این دامنه در پنل وجود ندارد!",
-  "Domain can not be resolved! there is a problem in your domain": "دامنه قابل دسترسی نیست! در دامنه شما مشکلی وجود دارد.",
   "selected domain for REALITY is not in the same ASN. To better use of the protocol, it is better to find a domain in the same ASN.": "دامنه انتخاب شده برای REALITY در همان ASN نیست. برای استفاده بهتر از این پروتکل، بهتر است یک دامنه در همان ASN پیدا کنید.",
   "User activated!": "یوزر شما فعال شد",
   "Package ended!": "پکیج شما به پایان رسید",

{hiddifypanel-9.0.0.dev92 → hiddifypanel-10.7.0.dev94}/hiddifypanel/translations.i18n/pt.json

@@ -607,10 +607,10 @@
       "description": "Shadowsocks é um proxy de túnel rápido que ajuda a contornar firewalls."
     }
   },
+  "Domain can not be resolved! there is a problem in your domain": "O domínio não pode ser resolvido! Há um problema em seu domínio. Verifique as configurações do seu Domínio.",
   "Error! auto cdn ip can not be find, please contact admin.": "Erro no Auto CDN IP! Não pode ser encontrado, entre em contato com o administrador",
   "Owner can not be deleted!": "",
   "This domain does not exist in the panel!": "Este Domínio não existe no Painel!",
-  "Domain can not be resolved! there is a problem in your domain": "O domínio não pode ser resolvido! Há um problema em seu domínio. Verifique as configurações do seu Domínio.",
   "selected domain for REALITY is not in the same ASN. To better use of the protocol, it is better to find a domain in the same ASN.": "O domínio selecionado para REALITY não está no mesmo ASN.\nPara melhor aproveitamento do Protocolo, é melhor encontrar um Domínio com o mesmo ASN",
   "User activated!": "Usuário ativado",
   "Package ended!": "Package encerrado",

{hiddifypanel-9.0.0.dev92 → hiddifypanel-10.7.0.dev94}/hiddifypanel/translations.i18n/ru.json

@@ -607,10 +607,10 @@
       "description": "Shadowsocks — это быстрый туннельный прокси, который помогает обходить брандмауэры."
     }
   },
+  "Domain can not be resolved! there is a problem in your domain": "Не возможно определить IP адрес для домена! В вашем домене возникла проблема. Пожалуйста, проверьте настройки.",
   "Error! auto cdn ip can not be find, please contact admin.": "Ошибка в IP-адресе Auto CDN! Невозможно найти, обратитесь к администратору",
   "Owner can not be deleted!": "",
   "This domain does not exist in the panel!": "Этого домена не существует в панели управления!",
-  "Domain can not be resolved! there is a problem in your domain": "Не возможно определить IP адрес для домена! В вашем домене возникла проблема. Пожалуйста, проверьте настройки.",
   "selected domain for REALITY is not in the same ASN. To better use of the protocol, it is better to find a domain in the same ASN.": "Выбранный домен для REALITY не находится в том же ASN. Для более эффективного использования протокола лучше найти Домен в том же ASN",
   "User activated!": "Пользователь активирован",
   "Package ended!": "Пакет закончился",

{hiddifypanel-9.0.0.dev92 → hiddifypanel-10.7.0.dev94}/hiddifypanel/translations.i18n/zh.json

@@ -607,10 +607,10 @@
       "description": "Shadowsocks 是一种快速隧道代理，可帮助您绕过防火墙。"
     }
   },
+  "Domain can not be resolved! there is a problem in your domain": "域名无法解析！您的域有问题。请检查您的域配置。",
   "Error! auto cdn ip can not be find, please contact admin.": "自动 CDN IP 错误！找不到，请联系管理员",
   "Owner can not be deleted!": "",
   "This domain does not exist in the panel!": "该域名在面板中不存在！",
-  "Domain can not be resolved! there is a problem in your domain": "域名无法解析！您的域有问题。请检查您的域配置。",
   "selected domain for REALITY is not in the same ASN. To better use of the protocol, it is better to find a domain in the same ASN.": "REALITY 的所选域不在同一 ASN 中。为了更好地使用该协议，最好在同一 ASN 中找到一个域",
   "User activated!": "用户激活",
   "Package ended!": "套餐已结束",

{hiddifypanel-9.0.0.dev92 → hiddifypanel-10.7.0.dev94}/hiddifypanel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 9.0.0.dev92
+Version: 10.7.0.dev94
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-manager/
 Author: hiddify

hiddifypanel-9.0.0.dev92/hiddifypanel/VERSION

@@ -1 +0,0 @@
-9.0.0.dev92

hiddifypanel-9.0.0.dev92/hiddifypanel/VERSION.py

@@ -1,3 +0,0 @@
-__version__='9.0.0.dev92'
-from datetime import datetime
-__release_date__= datetime.strptime('2024-03-03','%Y-%m-%d')