hiddifypanel 9.0.0.dev82__py3-none-any.whl → 9.0.0.dev92__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-9.0.0.dev82
+9.0.0.dev92

hiddifypanel/VERSION.py

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

hiddifypanel/base.py

@@ -95,8 +95,8 @@ def create_app(*args, cli=False, **config):
     commercial.init_app(app)
 
     app.config.update(config)  # Override with passed config
-    app.config['WTF_CSRF_CHECK_DEFAULT'] = False
-
+    # app.config['WTF_CSRF_CHECK_DEFAULT'] = False
+    app.config['WTF_CSRF_ENABLED'] = False
     # app.config['BABEL_TRANSLATION_DIRECTORIES'] = '/workspace/Hiddify-Server/hiddify-panel/src/translations.i18n'
 
     # from flask_wtf.csrf import CSRFProtect

hiddifypanel/hutils/encode.py

@@ -2,6 +2,11 @@ import urllib.parse
 import base64
 import uuid
 import string
+from slugify import slugify
+
+
+def unicode_slug(instr: str) -> str:
+    return slugify(instr, lowercase=False, allow_unicode=True)
 
 
 def url_encode(url: str) -> str:

hiddifypanel/models/proxy.py

@@ -67,6 +67,10 @@ class Proxy(db.Model, SerializerMixin):
     transport = db.Column(db.Enum(ProxyTransport), nullable=False)
     cdn = db.Column(db.Enum(ProxyCDN), nullable=False)
 
+    @property
+    def enabled(self):
+        return self.enable * 1
+
     def to_dict(self):
         return {
             'name': self.name,

hiddifypanel/models/user.py

@@ -120,7 +120,7 @@ class User(BaseAccount):
             is_active = False
         elif self.usage_limit < self.current_usage:
             is_active = False
-        elif self.remaining_days() < 0:
+        elif self.remaining_days < 0:
             is_active = False
         elif len(self.ips) > max(3, self.max_ips):
             is_active = False
@@ -163,6 +163,7 @@ class User(BaseAccount):
             days = package_mode_dic.get(self.mode, 10000)
         return max(-100000, min(days, 100000))
 
+    @property
     def remaining_days(self) -> int:
         """
         The "remaining_days" function calculates the number of days remaining for a user's account package based on the

hiddifypanel/models/utils.py

@@ -1,6 +1,4 @@
 
-from slugify import slugify
-
 
 def fill_username(model) -> None:
     from hiddifypanel import hutils

hiddifypanel/panel/admin/AdminstratorAdmin.py

@@ -40,6 +40,7 @@ class AdminstratorAdmin(AdminLTEModelView):
     column_list = ["name", 'UserLinks', 'mode', 'can_add_admin', 'max_active_users', 'max_users', 'online_users', 'comment']
     form_columns = ["name", 'mode', 'can_add_admin', 'max_active_users', 'max_users', 'comment', "uuid"]
     list_template = 'model/admin_list.html'
+    # column_editable_list = ['name']
     # edit_modal = True
     # form_overrides = {'work_with': Select2Field}
 

hiddifypanel/panel/admin/DomainAdmin.py

@@ -26,8 +26,8 @@ from flask import current_app
 
 
 class DomainAdmin(AdminLTEModelView):
-    edit_modal = False
-    create_modal = False
+    # edit_modal = False
+    # create_modal = False
     column_hide_backrefs = False
 
     list_template = 'model/domain_list.html'
@@ -77,7 +77,7 @@ class DomainAdmin(AdminLTEModelView):
                     re.IGNORECASE,
                     _("Invalid REALITY hostnames"))]}}
     column_list = ["domain", "alias", "mode", "domain_ip", "show_domains"]
-    # column_editable_list=["domain"]
+    column_editable_list = ["alias"]
     # column_filters=["domain","mode"]
     # form_excluded_columns=['work_with']
     column_searchable_list = ["domain", "mode"]

hiddifypanel/panel/admin/ProxyAdmin.py

@@ -104,11 +104,17 @@ def get_all_proxy_form(empty=False):
         class CDNForm(FlaskForm):
             pass
         cdn_proxies = [c for c in proxies if c.cdn == cdn]
-        protos = sorted([c for c in {c.proto: 1 for c in cdn_proxies}])
+        pgroup = {
+            'wireguard': 'other',
+            'tuic': 'other',
+            'ssh': 'other',
+            'hysteria2': 'other',
+        }
+        protos = sorted([c for c in {pgroup.get(c.proto, c.proto): 1 for c in cdn_proxies}])
         for proto in protos:
             class ProtoForm(FlaskForm):
                 pass
-            proto_proxies = [c for c in cdn_proxies if c.proto == proto]
+            proto_proxies = [c for c in cdn_proxies if pgroup.get(c.proto, c.proto) == proto]
             for proxy in proto_proxies:
                 field = SwitchField(proxy.name, default=proxy.enable, description=f"l3:{proxy.l3} transport:{proxy.transport}")
                 setattr(ProtoForm, f"p_{proxy.id}", field)

hiddifypanel/panel/admin/SettingAdmin.py

@@ -168,8 +168,11 @@ def get_config_form():
                 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))
             elif c.key == ConfigEnum.package_mode:
-                field = wtf.fields.SelectField(_(f"config.{c.key}.label"), choices=[("release", _("Release")), ("beta", _("Beta")),
-                                               ("develop", _("Develop"))], description=_(f"config.{c.key}.description"), default=hconfig(c.key))
+                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))
 
             elif c.key == ConfigEnum.shadowsocks2022_method:
                 field = wtf.fields.SelectField(_(f"config.{c.key}.label"), choices=[

hiddifypanel/panel/admin/UserAdmin.py

@@ -1,8 +1,9 @@
 import re
+from flask_admin.actions import action
 import datetime
 import uuid
 from apiflask import abort
-from flask_bootstrap import SwitchField
+from flask_bootstrap import SwitchField, BooleanField
 from flask_babel import gettext as __
 from .adminlte import AdminLTEModelView
 from wtforms.validators import NumberRange
@@ -22,16 +23,17 @@ from hiddifypanel import hutils
 
 class UserAdmin(AdminLTEModelView):
 
-    column_sortable_list = ["enable", "name", "current_usage", 'mode', "remaining_days", "comment", 'last_online', "uuid", 'remaining_days']
-    column_searchable_list = [("uuid"), "name"]
-    column_list = ["enable", "name", "UserLinks", "current_usage", "remaining_days", "comment", 'last_online', 'mode', 'admin', "uuid"]
+    column_sortable_list = ["is_active", "name", "current_usage", 'mode', "remaining_days", "comment", 'last_online', "uuid", 'remaining_days']
+    column_searchable_list = ["uuid", "name"]
+    column_list = ["is_active", "name", "UserLinks", "current_usage", "remaining_days", "comment", 'last_online', 'mode', 'admin', "uuid"]
+    column_editable_list = ["comment", "name"]
     form_extra_fields = {
         'reset_days': SwitchField(_("Reset package days")),
         'reset_usage': SwitchField(_("Reset package usage")),
         # 'disable_user': SwitchField(_("Disable User"))
     }
     list_template = 'model/user_list.html'
-    column_editable_list = ["comment", "usage_limit", "package_days"]
+
     form_columns = ["name", "comment", "usage_limit", "reset_usage", "package_days", "reset_days", "mode", "uuid", "enable",]
     # form_excluded_columns = ['current_usage', 'monthly', 'telegram_id', 'last_online', 'expiry_time', 'last_reset_time', 'current_usage_GB',
     #  'start_date', 'added_by', 'admin', 'details', 'max_ips', 'ed25519_private_key', 'ed25519_public_key', 'username', 'password']
@@ -42,6 +44,7 @@ class UserAdmin(AdminLTEModelView):
     # can_export = True
     # form_overrides = dict(monthly=SwitchField)
     form_overrides = {
+
         'start_date': custom_widgets.DaysLeftField,
         'mode': custom_widgets.EnumSelectField,
         'usage_limit': custom_widgets.UsageField
@@ -91,6 +94,7 @@ class UserAdmin(AdminLTEModelView):
         "package_days": _('Package Days'),
         "max_ips": _('Max IPs'),
         "enable": _('Enable'),
+        "is_active": _('Active'),
 
     }
     # can_set_page_size=True
@@ -119,33 +123,34 @@ class UserAdmin(AdminLTEModelView):
     # can_edit = False
     # def on_model_change(self, form, model, is_created):
     #     model.password = generate_password_hash(model.password)
+    def _enable_formatter(view, context, model, name):
+        if model.is_active:
+            link = '<i class="fa-solid fa-circle-check text-success"></i> '
+        elif len(model.ips):
+            link = '<i class="fa-solid fa-users-slash text-danger" title="{_("Too many Connected IPs")}"></i>'
+        else:
+            link = '<i class="fa-solid fa-circle-xmark text-danger"></i> '
 
-    def _name_formatter(view, context, model, name):
-        # print("model.telegram_id",model.telegram_id)
-        extra = ""
         if hconfig(ConfigEnum.telegram_bot_token):
             if model.telegram_id:
-                extra = f'<button class="btn hbtn bg-h-blue btn-xs " onclick="show_send_message({model.id})" ><i class="fa-solid fa-paper-plane"></i></button> '
+                link += f'<button class="btn hbtn bg-h-blue btn-xs " onclick="show_send_message({model.id})" ><i class="fa-solid fa-paper-plane"></i></button> '
             else:
-                extra = f'<button class="btn hbtn bg-h-grey btn-xs disabled"><i class="fa-solid fa-paper-plane"></i></button> '
+                link += f'<button class="btn hbtn bg-h-grey btn-xs disabled"><i class="fa-solid fa-paper-plane"></i></button> '
 
-        link = ''
-        # if model.is_active:
-        #     link = '<i class="fa-solid fa-circle-check text-success"></i> '
-        # elif len(model.ips):
-        #     link = '<i class="fa-solid fa-users-slash text-danger" title="{_("Too many Connected IPs")}"></i>'
-        # else:
-        #     link = '<i class="fa-solid fa-circle-xmark text-danger"></i> '
+        return Markup(link)
 
-        href = f'{hiddify.get_account_panel_link(model, request.host, is_https=True)}#{hutils.encode.url_encode(model.name)}'
+    # def _name_formatter(view, context, model, name):
+    #     # print("model.telegram_id",model.telegram_id)
 
-        link += f"<a target='_blank' class='share-link' data-copy='{href}' href='{href}'>{model.name} <i class='fa-solid fa-arrow-up-right-from-square'></i></a>"
+    def _ul_formatter(view, context, model, name):
+        href = f'{hiddify.get_account_panel_link(model, request.host, is_https=True)}#{hutils.encode.unicode_slug(model.name)}'
 
-        return Markup(extra + link)
+        link = f"""<a target='_blank' class='share-link btn btn-xs btn-primary' data-copy='{href}' href='{href}'>
+        <i class='fa-solid fa-arrow-up-right-from-square'></i> 
+        {_("Current Domain")} </a>"""
 
-    def _ul_formatter(view, context, model, name):
-        domains = get_panel_domains()
-        return Markup(" ".join([hiddify.get_html_user_link(model, d) for d in domains]))
+        domains = [d for d in get_panel_domains() if d.domain != request.host]
+        return Markup(link + " ".join([hiddify.get_html_user_link(model, d) for d in domains]))
 
     def _uuid_formatter(view, context, model, name):
         return Markup(f"<span>{model.uuid}</span>")
@@ -167,7 +172,7 @@ class UserAdmin(AdminLTEModelView):
         """)
 
     def _expire_formatter(view, context, model, name):
-        remaining = model.remaining_days()
+        remaining = model.remaining_days
 
         diff = datetime.timedelta(days=remaining)
 
@@ -194,13 +199,15 @@ class UserAdmin(AdminLTEModelView):
         # return Markup(f"<span class='badge ltr badge-{'success' if days>7 else ('warning' if days>0 else 'danger') }'>{days}</span> "+_('days'))
 
     column_formatters = {
-        'name': _name_formatter,
+        # 'name': _name_formatter,
         'UserLinks': _ul_formatter,
         'uuid': _uuid_formatter,
         'current_usage': _usage_formatter,
         "remaining_days": _expire_formatter,
         'last_online': _online_formatter,
-        'admin': _admin_formatter
+        'admin': _admin_formatter,
+
+        "is_active": _enable_formatter
     }
 
     def on_model_delete(self, model):
@@ -223,7 +230,7 @@ class UserAdmin(AdminLTEModelView):
             delattr(form, 'reset_usage')
             # delattr(form,'disable_user')
         else:
-            remaining = form._obj.remaining_days()  # remaining_days(form._obj)
+            remaining = form._obj.remaining_days  # remaining_days(form._obj)
             msg = _("Remaining: ") + hutils.convert.format_timedelta(datetime.timedelta(days=remaining))
             form.reset_days.label.text += f" ({msg})"
             usr_usage = f" ({_('user.home.usage.title')} {round(form._obj.current_usage_GB,3)}GB)"
@@ -297,7 +304,7 @@ class UserAdmin(AdminLTEModelView):
     def get_list(self, page, sort_column, sort_desc, search, filters, page_size=50, *args, **kwargs):
         res = None
         # print('aaa',args, kwargs)
-        if sort_column == 'remaining_days':
+        if sort_column in ['remaining_days', 'is_active']:
             query = self.get_query()
 
             if search:
@@ -312,7 +319,7 @@ class UserAdmin(AdminLTEModelView):
             count = len(data)
 
             # Sorting the data
-            data = sorted(data, key=lambda p: p.remaining_days(), reverse=sort_desc)
+            data = sorted(data, key=lambda p: getattr(p, sort_column), reverse=sort_desc)
 
             # Applying pagination
             start = page * page_size

hiddifypanel/panel/admin/adminlte.py

@@ -5,8 +5,8 @@ from flask_admin.form import SecureForm
 
 class AdminLTEModelView(ModelView):
     form_base_class = SecureForm
-    edit_modal = False
-    create_modal = False
+    edit_modal = True
+    create_modal = True
 
     list_template = 'hiddify-flask-admin/list.html'
     create_template = 'flask-admin/model/create.html'

hiddifypanel/panel/admin/fix_flaskadmin_babel.py

@@ -11,9 +11,8 @@ import flask_admin.babel
 def gettext(string, **variables):
 
     tt = _(string, **variables)
-    print("=--", string, tt)
+    # print("=--", string, tt)
     if tt == string:
-        print("getting orig")
         return gettext_old(string, **variables)
     return tt
 

hiddifypanel/panel/admin/templates/configfake.html

@@ -2,6 +2,7 @@ Please don't edit this filename
 It is just for babel
 generated from /admin/setting-admin/get_babel_string/
 {{_("Create")}}
+{{_("Current Domain")}}
 
 {{_("domain.cdn")}} {{_("Create")}} {{_("Save & Add More")}} {{_("Close")}} {{_("Back")}}
 {{_("config.admin_lang.label")}}

hiddifypanel/panel/commercial/ProxyDetailsAdmin.py

@@ -3,7 +3,7 @@ from hiddifypanel.panel.admin.adminlte import AdminLTEModelView
 from flask_babel import gettext as __
 from flask_babel import lazy_gettext as _
 from hiddifypanel.panel import hiddify
-from flask import g, redirect
+from flask import g, redirect, Markup
 from hiddifypanel.hutils.flask import hurl_for, flash
 from hiddifypanel.auth import login_required
 from flask_admin.model.template import EndpointLinkRowAction
@@ -21,6 +21,7 @@ class ProxyDetailsAdmin(AdminLTEModelView):
     form_excluded_columns = ['child']
     column_exclude_list = ['child']
     column_searchable_list = ['name', 'proto', 'transport', 'l3', 'cdn']
+    column_editable_list = ['name']
 
     @action('disable', 'Disable', 'Are you sure you want to disable selected proxies?')
     def action_disable(self, ids):
@@ -39,7 +40,7 @@ class ProxyDetailsAdmin(AdminLTEModelView):
         self.session.commit()
         flash(_('%(count)s records were successfully enabled.', count=count), 'success')
         hiddify.get_available_proxies.invalidate_all()
-    column_editable_list = ['name']
+
     # list_template = 'model/domain_list.html'
 
     # form_overrides = {'work_with': Select2Field}
@@ -60,3 +61,14 @@ class ProxyDetailsAdmin(AdminLTEModelView):
         if login_required(roles={Role.super_admin, Role.admin})(lambda: True)() != True:
             return False
         return True
+
+    def _enable_formatter(view, context, model, name):
+        if model.enable:
+            link = '<i class="fa-solid fa-circle-check text-success"></i> '
+        else:
+            link = '<i class="fa-solid fa-circle-xmark text-danger"></i> '
+        return Markup(link)
+    column_formatters = {
+
+        "enable": _enable_formatter
+    }

hiddifypanel/panel/commercial/restapi/v2/user/info_api.py

@@ -55,7 +55,7 @@ class InfoAPI(MethodView):
         dto.profile_url = f"{c['profile_url']}#{hutils.encode.url_encode(c['user'].name)}"
         dto.profile_usage_current = g.account.current_usage_GB
         dto.profile_usage_total = g.account.usage_limit_GB
-        dto.profile_remaining_days = g.account.remaining_days()
+        dto.profile_remaining_days = g.account.remaining_days
         dto.profile_reset_days = g.account.days_to_reset()
         dto.telegram_bot_url = f"https://t.me/{c['bot'].username}?start={g.account.uuid}" if c['bot'] else ""
         dto.telegram_id = c['user'].telegram_id
@@ -66,7 +66,8 @@ class InfoAPI(MethodView):
         # with force_locale("fa"):
         dto.admin_message_html = hconfig(ConfigEnum.branding_freetext) or _("Join our Hiddify Telegram channel to get the latest updates on Hiddify.")
         if not hconfig(ConfigEnum.branding_freetext) and auth.admin_session_is_exist():
-            dto.admin_message_html += "<p style='font-style: italic;font-size:8px'>" + _("[Admin only visible message:] You can change this message from settings") + "</p>"
+            dto.admin_message_html += "<p style='font-style: italic;font-size:8px'>" + \
+                _("[Admin only visible message:] You can change this message from settings") + "</p>"
         dto.admin_message_url = hconfig(ConfigEnum.branding_site) or "https://t.me/hiddify"
         dto.brand_title = hconfig(ConfigEnum.branding_title) or _("Hiddify")
 

hiddifypanel/panel/hiddify.py

@@ -149,7 +149,7 @@ def get_html_user_link(model: BaseAccount, domain: Domain):
     if "*" in d:
         d = d.replace("*", hutils.random.get_random_string(5, 15))
 
-    link = f'{get_account_panel_link(model, d)}#{hutils.encode.url_encode(model.name)}'
+    link = f'{get_account_panel_link(model, d)}#{hutils.encode.unicode_slug(model.name)}'
 
     text = domain.alias or domain.domain
     color_cls = 'info'

hiddifypanel/panel/init_db.py

@@ -618,8 +618,8 @@ def init_db():
     get_hconfigs.invalidate_all()
     # set_hconfig(ConfigEnum.db_version, 71)
     # temporary fix
-    add_column(Child.mode)
-    add_column(Child.name)
+    # add_column(Child.mode)
+    # add_column(Child.name)
     db_version = int(hconfig(ConfigEnum.db_version) or 0)
     if db_version == latest_db_version():
         return

hiddifypanel/panel/user/link_maker.py

@@ -234,7 +234,7 @@ def make_proxy(hconfigs, proxy: Proxy, domain_db: Domain, phttp=80, ptls=443, pp
         base['flow'] = 'xtls-rprx-vision'
         return {**base, 'transport': 'tcp'}
 
-    if proxy.proto in {'vless', 'trojan', 'vmess'} and hconfigs[ConfigEnum.mux_enable]:
+    if proxy.proto in {'vless', 'trojan', 'vmess'} and hconfigs.get(ConfigEnum.mux_enable):
         if hconfigs[ConfigEnum.mux_enable]:
             base['mux_enable'] = True
             base['mux_protocol'] = hconfigs[ConfigEnum.mux_protocol]
@@ -355,7 +355,7 @@ def to_link(proxy):
         #     return f'{baseurl}?plugin=shadow-tls%3Bpassword%3D{proxy["proxy_path"]}%3Bhost%3D{proxy["fakedomain"]}%3Budp-over-tcp=true#{name_link}'
         if proxy['proto'] == 'v2ray':
             return f'{baseurl}?plugin=v2ray-plugin%3Bmode%3Dwebsocket%3Bpath%3D{proxy["path"]}%3Bhost%3D{proxy["host"]}%3Btls%3Budp-over-tcp=true#{name_link}'
-        if proxy['transport']=='shadowsocks':
+        if proxy['transport'] == 'shadowsocks':
             return baseurl
     if proxy['proto'] == 'tuic':
         baseurl = f'tuic://{proxy["uuid"]}:{proxy["uuid"]}@{proxy["server"]}:{proxy["port"]}?congestion_control=cubic&udp_relay_mode=native&sni={proxy["sni"]}&alpn=h3'

hiddifypanel/panel/user/user.py

@@ -309,7 +309,7 @@ def get_common_data(user_uuid, mode, no_domain=False, filter_domain=None):
 
     }
 
-    expire_days = user.remaining_days()
+    expire_days = user.remaining_days
     reset_days = user.days_to_reset()
     if reset_days >= expire_days:
         reset_days = 1000

hiddifypanel/static/js/custom-rtl.js

@@ -1,8 +1,12 @@
-function ConvertNumberToPersion() {
+function ConvertNumberToPersion(elemnt) {
   let persian = { 0: '۰', 1: '۱', 2: '۲', 3: '۳', 4: '۴', 5: '۵', 6: '۶', 7: '۷', 8: '۸', 9: '۹' };
   let replace = {
     "Admin User": "مدیر", "User": 'کاربر',
-    'Create': 'ایجاد', "Back": "بازگشت", "Save & Add More": "ذخیره و ایجاد جدید", "Edit": "ویرایش", "Domain": "دامنه", "Proxy": "پروکسی"
+    'Create': 'ایجاد',
+    "Edit": "ویرایش",
+    "Domain": "دامنه",
+    "Proxy": "پروکسی",
+
   }
   // $('input[value="Save & Add More"]').val("ذخیره و ایجاد جدید")
 
@@ -31,12 +35,12 @@ function ConvertNumberToPersion() {
       traverse(el.childNodes[i]);
     }
   }
-  traverse(document.body);
+  traverse(elemnt);
 }
 
 
 $(document).ready(function () {
 
-  ConvertNumberToPersion();
+  ConvertNumberToPersion(document.body);
 
 });

hiddifypanel/static/js/custom.js

@@ -1,4 +1,4 @@
-function ConvertNumberToPersion() {
+function ConvertNumberToPersion(elemnt) {
 }
 
 $(document).ready(function () {