hiddifypanel 9.0.0.dev53__py3-none-any.whl → 9.0.0.dev60__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-9.0.0.dev53
+9.0.0.dev60

hiddifypanel/VERSION.py

@@ -1,3 +1,3 @@
-__version__='9.0.0.dev53'
+__version__='9.0.0.dev60'
 from datetime import datetime
-__release_date__= datetime.strptime('2024-01-15','%Y-%m-%d')
+__release_date__= datetime.strptime('2024-01-21','%Y-%m-%d')

hiddifypanel/base.py

@@ -91,7 +91,7 @@ def create_app(cli=False, **config):
         if "admin" in request.base_url:
             g.locale = hconfig(ConfigEnum.admin_lang) or hconfig(ConfigEnum.lang) or 'fa'
         else:
-            g.locale = hconfig(ConfigEnum.lang) or "fa"
+            g.locale = g.account.lang if isinstance(g.get('account'), User) and g.account.lang else hconfig(ConfigEnum.lang) or 'fa'
         return g.locale
 
     from flask_wtf.csrf import CSRFProtect

hiddifypanel/hutils/utils.py

@@ -235,3 +235,11 @@ def convert_to_int(s: str) -> int:
 
 def is_out_of_range_port(port: int) -> bool:
     return port < 1 or port > 65535
+
+
+def is_int(input: str) -> bool:
+    try:
+        int(input)
+        return True
+    except:
+        return False

hiddifypanel/models/config_enum.py

@@ -20,6 +20,7 @@ class ConfigCategory(StrEnum):
     telegram = auto()
     http = auto()
     tls = auto()
+    mux = auto()
     tls_trick = auto()
     ssh = auto()
     ssfaketls = auto()
@@ -81,6 +82,17 @@ class ConfigEnum(StrEnum):
     tls_padding_enable = auto()
     tls_padding_length = auto()
 
+    # mux
+    mux_enable = auto()
+    mux_protocol = auto()
+    mux_max_connections = auto()
+    mux_min_streams = auto()
+    mux_max_streams = auto()
+    mux_padding_enable = auto()
+    mux_brutal_enable = auto()
+    mux_brutal_up_mbps = auto()
+    mux_brutal_down_mbps = auto()
+
     http_ports = auto()
     kcp_ports = auto()
     kcp_enable = auto()
@@ -219,6 +231,16 @@ class ConfigEnum(StrEnum):
             self.tls_padding_enable: {'category': ConfigCategory.tls_trick, 'apply_mode': 'apply', 'type': bool},
             self.tls_padding_length: {'category': ConfigCategory.tls_trick, 'apply_mode': 'apply'},
 
+            # mux
+            self.mux_enable: {'category': ConfigCategory.mux, 'apply_mode': 'apply', 'type': bool},
+            self.mux_protocol: {'category': ConfigCategory.mux, 'apply_mode': 'apply'},
+            self.mux_max_connections: {'category': ConfigCategory.mux, 'apply_mode': 'apply'},
+            self.mux_min_streams: {'category': ConfigCategory.mux, 'apply_mode': 'apply'},
+            self.mux_max_streams: {'category': ConfigCategory.mux, 'apply_mode': 'apply'},
+            self.mux_padding_enable: {'category': ConfigCategory.mux, 'apply_mode': 'apply', 'type': bool},
+            self.mux_brutal_enable: {'category': ConfigCategory.mux, 'apply_mode': 'apply', 'type': bool},
+            self.mux_brutal_up_mbps: {'category': ConfigCategory.mux, 'apply_mode': 'apply'},
+            self.mux_brutal_down_mbps: {'category': ConfigCategory.mux, 'apply_mode': 'apply'},
 
             self.http_ports: {'category': ConfigCategory.http, 'apply_mode': 'apply'},  # http
             self.kcp_ports: {'category': ConfigCategory.hidden, 'apply_mode': 'apply'},
@@ -257,7 +279,7 @@ class ConfigEnum(StrEnum):
             self.tuic_port: {'category': ConfigCategory.hidden, 'apply_mode': 'apply'},
 
             self.hysteria_enable: {'category': ConfigCategory.hidden, 'type': bool, 'apply_mode': 'apply'},
-            self.hysteria_port: {'category': ConfigCategory.hysteria, 'apply_mode': 'apply'},
+            self.hysteria_port: {'category': ConfigCategory.hidden, 'apply_mode': 'apply'},
             self.hysteria_obfs_enable: {'category': ConfigCategory.hysteria, 'type': bool, 'apply_mode': 'apply'},
             self.hysteria_up_mbps: {'category': ConfigCategory.hysteria, 'apply_mode': 'apply'},
             self.hysteria_down_mbps: {'category': ConfigCategory.hysteria, 'apply_mode': 'apply'},

hiddifypanel/panel/admin/AdminstratorAdmin.py

@@ -168,7 +168,7 @@ class AdminstratorAdmin(AdminLTEModelView):
 
     # @login_required(roles={Role.super_admin, Role.admin})
     def is_accessible(self):
-        if login_required(roles={Role.super_admin, Role.admin})(lambda: True)() != True:
+        if login_required(roles={Role.super_admin, Role.admin, Role.agent})(lambda: True)() != True:
             return False
         return True
 

hiddifypanel/panel/admin/SettingAdmin.py

@@ -211,6 +211,9 @@ def get_config_form():
                 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))
+            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"))
             elif c.key == ConfigEnum.warp_sites:
                 validators = [wtf.validators.Length(max=2048)]
                 render_kw = {'class': "ltr", 'maxlength': 2048}
@@ -265,9 +268,14 @@ def get_config_form():
                         render_kw['required'] = ""
                     else:
                         validators.append(wtf.validators.Regexp("^(\d+)(,\d+)*$|^$", re.IGNORECASE, _("config.Invalid port")))
-
                     # validators.append(wtf.validators.Regexp("^(\d+)(,\d+)*$",re.IGNORECASE,_("config.port is required")))
 
+                # tls tricks validations
+                if c.key in [ConfigEnum.tls_fragment_size, ConfigEnum.tls_fragment_sleep, ConfigEnum.tls_padding_length]:
+                    validators.append(wtf.validators.Regexp("^\d+-\d+$", re.IGNORECASE, _("config.Invalid! The pattern is number-number")+f' {c.key}'))
+                # mux and hysteria validations
+                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

hiddifypanel/panel/admin/UserAdmin.py

@@ -121,7 +121,7 @@ class UserAdmin(AdminLTEModelView):
         # print("model.telegram_id",model.telegram_id)
         extra = ""
         if hconfig(ConfigEnum.telegram_bot_token):
-            if model.telegram_id:
+            if model.telegram_id and model.telegram_id != '0':
                 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> '
             else:
                 extra = f'<button class="btn hbtn bg-h-grey btn-xs disabled"><i class="fa-solid fa-paper-plane"></i></button> '
@@ -249,9 +249,10 @@ class UserAdmin(AdminLTEModelView):
             flash(('<div id="show-modal-donation"></div>'), ' d-none')
         if not re.match("^[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}$", model.uuid):
             raise ValidationError('Invalid UUID e.g.,' + str(uuid.uuid4()))
-
         if form.reset_usage.data:
             model.current_usage_GB = 0
+        # if model.telegram_id and model.telegram_id != '0' and not re.match(r"^[1-9]\d*$", model.telegram_id):
+        #     raise ValidationError('Invalid Telegram ID')
         # if form.disable_user.data:
         #     model.mode=UserMode.disable
         if form.reset_days.data:

hiddifypanel/panel/auth.py

@@ -155,7 +155,7 @@ def init_app(app):
             g.is_admin = hiddify.is_admin_role(account.role)  # type: ignore
             login_user(account, force=True)
             # print("loggining in")
-            if next_url is not None and g.user_agent['is_browser']:
+            if next_url is not None and g.user_agent['is_browser'] and ".webmanifest" not in request.path:
                 return redirect(next_url)
 
     @app.url_value_preprocessor

hiddifypanel/panel/commercial/restapi/v1/tgbot.py

@@ -56,8 +56,7 @@ def init_app(app):
 
 
 class TGBotResource(Resource):
-    @hiddify.api_v1_auth
-    def post(self, admin_uuid):
+    def post(self, admin_uuid=None):
         try:
             if request.headers.get('content-type') == 'application/json':
                 json_string = request.get_data().decode('utf-8')

hiddifypanel/panel/commercial/restapi/v1/tgmsg.py

@@ -1,46 +1,27 @@
-from flask import request
+from typing import List
+from flask import g, request
 from apiflask import abort
 from flask_restful import Resource
 # from flask_simplelogin import login_required
 import datetime
-from hiddifypanel.panel.database import db
+
+from hiddifypanel import hutils
 from hiddifypanel.models import *
-from hiddifypanel.panel.auth import login_required
-from hiddifypanel.panel import hiddify, usage
 from .tgbot import bot
 
 
 class SendMsgResource(Resource):
     # decorators = [login_required({Role.super_admin})]
-    @hiddify.api_v1_auth
-    def post(self, admin_uuid):
+    def post(self, admin_uuid=None):
 
         if not hconfig(ConfigEnum.telegram_bot_token) or not bot:
             abort(400, 'invalid request')
 
         msg = request.json
-        users = User.query.filter(User.telegram_id != None)
-        id = msg['id']
-        if type(id) == int or id.isnumeric():
-            users = [users.filter(User.id == int(msg['id'])).first() or abort(403)]
-        elif id == 'all':
-            users = users.all()
-        else:
-            users = users.all()
-            if id == 'expired':
-                users = [u for u in users if not u.is_active]
-            elif id == 'active':
-                users = [u for u in users if u.is_active]
-            elif id == 'offline 1h':
-                h1 = datetime.datetime.now()-datetime.timedelta(hours=1)
-                users = [u for u in users if u.is_active and u.last_online < h1]
-            elif id == 'offline 1d':
-                d1 = datetime.datetime.now()-datetime.timedelta(hours=24)
-                users = [u for u in users if u.is_active and u.last_online < d1]
-
-            elif id == 'offline 1w':
-                d7 = datetime.datetime.now()-datetime.timedelta(days=7)
-                users = [u for u in users if u.is_active and u.last_online < d7]
+        if not msg or not msg.get('id') or not msg.get('text'):
+            abort(400, 'invalid request')
+
+        users = self.get_users_by_identifier(msg['id'])
 
         res = {}
         for user in users:
@@ -51,9 +32,36 @@ class SendMsgResource(Resource):
                 print('sending to ', user)
                 bot.send_message(user.telegram_id, txt, reply_markup=keyboard)
             except Exception as e:
-                import traceback
                 res[user.uuid] = {'name': user.name, 'error': f'{e}'}
         if len(res) == 0:
             return {'msg': "success"}
         else:
             return {'msg': 'error', 'res': res}
+
+    def get_users_by_identifier(self, identifier: str) -> List[User]:
+        '''Returns all users that match the identifier for sending a message to them'''
+        # when we are here we must have g.account but ...
+        if not hasattr(g, 'account'):
+            return []
+        query = User.query.filter(User.added_by.in_(g.account.recursive_sub_admins_ids()))
+        query = query.filter(User.telegram_id != None, User.telegram_id != 0)
+
+        if hutils.utils.is_int(identifier):
+            return [query.filter(User.id == int(identifier)).first() or abort(404, 'The user not found')]  # type: ignore
+        elif identifier == 'all':
+            return query.all()
+        elif identifier == 'expired':
+            return [u for u in query.all() if not u.is_active]
+        elif identifier == 'active':
+            return [u for u in query.all() if u.is_active]
+        elif identifier == 'offline 1h':
+            h1 = datetime.datetime.now()-datetime.timedelta(hours=1)
+            return [u for u in query.all() if u.is_active and u.last_online < h1]
+        elif identifier == 'offline 1d':
+            d1 = datetime.datetime.now()-datetime.timedelta(hours=24)
+            return [u for u in query.all() if u.is_active and u.last_online < d1]
+        elif identifier == 'offline 1w':
+            d7 = datetime.datetime.now()-datetime.timedelta(days=7)
+            return [u for u in query.all() if u.is_active and u.last_online < d7]
+        else:
+            return []

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

@@ -46,14 +46,17 @@ class AllConfigsAPI(MethodView):
         items.append(
             create_item(
                 "Auto", "ALL", "ALL", "", "", "",
-                f"{base_url}sub/?asn={c['asn']}")
+                # f"{base_url}sub/?asn={c['asn']}"
+                f"{base_url}auto/?asn={c['asn']}"
+            )
         )
 
         # Add Full Singbox
         items.append(
             create_item(
                 "Full Singbox", "ALL", "ALL", "", "", "",
-                f"{base_url}full-singbox.json?asn={c['asn']}"
+                # f"{base_url}full-singbox.json?asn={c['asn']}"
+                f"{base_url}singbox/?asn={c['asn']}"
             )
         )
 
@@ -61,7 +64,8 @@ class AllConfigsAPI(MethodView):
         items.append(
             create_item(
                 "Clash Meta", "ALL", "ALL", "", "", "",
-                f"clashmeta://install-config?url={base_url}clash/meta/all.yml&name=mnormal_{c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}-{c['mode']}&asn={c['asn']}&mode={c['mode']}"
+                # f"clashmeta://install-config?url={base_url}clash/meta/all.yml&name=mnormal_{c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}-{c['mode']}&asn={c['asn']}&mode={c['mode']}"
+                f"clash://install-config?url={base_url}clashmeta/?asn={c['asn']}"
             )
         )
 
@@ -69,7 +73,8 @@ class AllConfigsAPI(MethodView):
         items.append(
             create_item(
                 "Clash", "ALL", "Except VLess", "", "", "",
-                f"clash://install-config?url={base_url}clash/all.yml&name=new_normal_{c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}-{c['mode']}&asn={c['asn']}&mode={c['mode']}"
+                # f"clash://install-config?url={base_url}clash/all.yml&name=new_normal_{c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}-{c['mode']}&asn={c['asn']}&mode={c['mode']}"
+                f"clash://install-config?url={base_url}clash/?asn={c['asn']}"
             )
         )
 
@@ -78,7 +83,8 @@ class AllConfigsAPI(MethodView):
             items.append(
                 create_item(
                     "Singbox: SSH", "SSH", "SHH", "", "", "",
-                    f"{base_url}singbox.json?name={c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}&asn={c['asn']}&mode={c['mode']}"
+                    # f"{base_url}singbox.json?name={c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}&asn={c['asn']}&mode={c['mode']}"
+                    f"{base_url}singbox-ssh/?asn={c['asn']}"
                 )
             )
 
@@ -86,7 +92,8 @@ class AllConfigsAPI(MethodView):
         items.append(
             create_item(
                 "Subscription link", "ALL", "ALL", "", "", "",
-                f"{base_url}all.txt?name={c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}&asn={c['asn']}&mode={c['mode']}"
+                # f"{base_url}all.txt?name={c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}&asn={c['asn']}&mode={c['mode']}"
+                f"{base_url}sub/?asn={c['asn']}"
             )
         )
 
@@ -94,7 +101,8 @@ class AllConfigsAPI(MethodView):
         items.append(
             create_item(
                 "Subscription link b64", "ALL", "ALL", "", "", "",
-                f"{base_url}all.txt?name=new_link_{c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}-{c['mode']}&asn={c['asn']}&mode={c['mode']}&base64=True"
+                # f"{base_url}all.txt?name=new_link_{c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}-{c['mode']}&asn={c['asn']}&mode={c['mode']}&base64=True"
+                f"{base_url}sub64/?asn={c['asn']}"
             )
         )
 

hiddifypanel/panel/commercial/telegrambot/Usage.py

@@ -1,3 +1,4 @@
+from hiddifypanel.panel import hiddify
 from telebot import types
 from flask_babelex import gettext as _
 from flask import current_app as app
@@ -52,7 +53,7 @@ def get_usage_msg(uuid, domain=None):
         reset_day = user_data['reset_day']
 
         domain = domain or get_panel_domains()[0]
-        user_link = hiddify.get_account_panel_link(user,domain.domain)
+        user_link = hiddify.get_account_panel_link(user, domain.domain)
         msg = f"""{_('<a href="%(user_link)s"> %(user)s</a>',user_link=user_link ,user=user.name if user.name != "default" else "")}\n\n"""
 
         msg += f"""{_('user.home.usage.title')} {round(user.current_usage_GB, 3)}GB <b>{_('user.home.usage.from')}</b> {user.usage_limit_GB}GB  {_('user.home.usage.monthly') if user.monthly else ''}\n"""

hiddifypanel/panel/common.py

@@ -100,7 +100,6 @@ def init_app(app: APIFlask):
     @app.url_defaults
     def add_proxy_path_user(endpoint, values):
         if 'proxy_path' not in values:
-
             if hasattr(g, 'account') and isinstance(g.account, AdminUser):
                 values['proxy_path'] = hconfig(ConfigEnum.proxy_path_admin)
             # elif 'static' in endpoint:
@@ -114,8 +113,8 @@ def init_app(app: APIFlask):
 
         if hiddify.is_api_v1_call(endpoint=endpoint) and 'admin_uuid' not in values:
             values['admin_uuid'] = AdminUser.get_super_admin_uuid()
-        # if 'secret_uuid' not in values:
-        #     values['secret_uuid'] = AdminUser.get_super_admin_uuid()
+        # if 'secret_uuid' not in values and g.account and ".webmanifest" in request.path:
+        #     values['secret_uuid'] = g.account.uuid
 
     @app.route("/<proxy_path>/videos/<file>")
     @app.doc(hide=True)

hiddifypanel/panel/common_bp/login.py

@@ -1,6 +1,6 @@
 from flask_classful import FlaskView, route
 from hiddifypanel.panel.auth import login_required, current_account, login_user, logout_user, login_by_uuid
-from flask import redirect, request, g, url_for, render_template, flash
+from flask import redirect, request, g, url_for, render_template, flash, jsonify
 from flask import current_app as app
 from flask_babelex import lazy_gettext as _
 from apiflask import abort
@@ -118,8 +118,7 @@ class LoginView(FlaskView):
 
     #     return redirect(f"/{proxy_path}/{path}")
 
-    @route('/manifest.webmanifest')
-    @login_required()
+    @route('/<secret_uuid>/manifest.webmanifest')
     def create_pwa_manifest(self):
         domain = request.host
         name = (domain if hiddify.is_admin_panel_call() else g.account.name)
@@ -130,7 +129,7 @@ class LoginView(FlaskView):
             "background_color": "#1a1b21",
             "display": "standalone",
             "scope": f"/",
-            "start_url": hiddify.get_account_panel_link(g.account, domain) +"?pwa=true",
+            "start_url": hiddify.get_account_panel_link(g.account, domain) + "?pwa=true",
             "description": "Hiddify, for a free Internet",
             "orientation": "any",
             "icons": [

hiddifypanel/panel/hiddify.py

@@ -1,4 +1,5 @@
 import glob
+import uuid
 import user_agents
 import json
 import subprocess
@@ -876,7 +877,7 @@ def get_direct_host_or_ip(prefer_version: int):
     else:
         direct = hutils.ip.get_ip(prefer_version)
     if not direct:
-        direct = hutils.ip.get_ip(socket.AF_INET if prefer_version == socket.AF_INET6 else socket.AF_INET6)
+        direct = hutils.ip.get_ip(4 if prefer_version == 6 else 6)
     return direct
 
 

hiddifypanel/panel/init_db.py

@@ -148,6 +148,18 @@ def init_db():
 #     add_config_if_not_exist(ConfigEnum.hysteria_enable, True)
 #     add_config_if_not_exist(ConfigEnum.hysteria_port, random.randint(5000, 20000))
 
+def _v65():
+    add_config_if_not_exist(ConfigEnum.mux_enable, False)
+    add_config_if_not_exist(ConfigEnum.mux_protocol, 'smux')
+    add_config_if_not_exist(ConfigEnum.mux_max_connections, '4')
+    add_config_if_not_exist(ConfigEnum.mux_min_streams, '4')
+    add_config_if_not_exist(ConfigEnum.mux_max_streams, '0')
+    add_config_if_not_exist(ConfigEnum.mux_padding_enable, False)
+    add_config_if_not_exist(ConfigEnum.mux_brutal_enable, True)
+    add_config_if_not_exist(ConfigEnum.mux_brutal_up_mbps, '100')
+    add_config_if_not_exist(ConfigEnum.mux_brutal_down_mbps, '100')
+
+
 def _v64():
     set_hconfig(ConfigEnum.ssh_server_redis_url, "unix:///opt/hiddify-manager/other/redis/run.sock?db=1")
 

hiddifypanel/panel/user/link_maker.py

@@ -720,7 +720,7 @@ def add_singbox_ssh(all_base, proxy):
 
 def make_full_singbox_config(domains, **kwargs):
     ua = hiddify.get_user_agent()
-    base_config = json.loads(render_template('base_singbox_config.json'))
+    base_config = json.loads(render_template('base_singbox_config.json.j2'))
     allphttp = [p for p in request.args.get("phttp", "").split(',') if p]
     allptls = [p for p in request.args.get("ptls", "").split(',') if p]
 

hiddifypanel/panel/user/templates/{base_singbox_config.json → base_singbox_config.json.j2}

@@ -47,7 +47,7 @@
             "format": "binary",
             "url": "https:\/\/raw.githubusercontent.com\/Chocolate4U\/Iran-sing-box-rules\/rule-set\/geoip-ir.srs",
             "download_detour": "bypass"
-            },
+            }
             {%endif%}
             {# {
                 "tag": "geosite-category-ads-all",
@@ -57,7 +57,7 @@
                 "download_detour": {% if hconfig(ConfigEnum.country)=='cn' %}"Select" {%else%}"bypass"{%endif%} 
             } #}
         ],
-  {%endif%}
+        {%endif%}
         "rules": [
             {
                 "outbound": "dns-out",
@@ -71,7 +71,7 @@
                 ],
                 "outbound": "dns-out"
             },
-            {%if hconfig(ConfigEnum.country)in ["ir","cn","ru"]%}
+            {%if hconfig(ConfigEnum.country) in ["ir","cn","ru"]%}
             {
                 "domain_suffix": [
                     "{{hconfig(ConfigEnum.country)}}"
@@ -89,16 +89,22 @@
                 "outbound": "block"
             }, #}
             {%if hconfig(ConfigEnum.country) in ["ir","cn","ru"]%}
+            {% if V1_7 %}
             {
-                {% if V1_7 %}
                 "geoip": ["{{hconfig(ConfigEnum.country)}}"],
-                {%else%}
+                "outbound": "bypass"
+            },
+            {%else%}
+            {
                 "rule_set": "geoip-{{hconfig(ConfigEnum.country)}}",
+                "outbound": "bypass"
+            },
+            {
                 "rule_set": "geosite-{{hconfig(ConfigEnum.country)}}",
-                {%endif%}
                 "outbound": "bypass"
             },
             {%endif%}
+            {%endif%}
             {
                 "protocol": "quic",
                 "port": [

hiddifypanel/panel/user/templates/new.html

@@ -9,9 +9,11 @@
     <link rel="stylesheet" href="node_modules/smartbanner.js/dist/smartbanner.min.css">
     <link href="https://cdn.jsdelivr.net/gh/rastikerdar/vazirmatn@v33.003/Vazirmatn-font-face.css" rel="stylesheet" type="text/css" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-
+    <link rel="icon" type="image/x-icon" href="{{ static_url_for( filename='images/favicon.ico')}}">
+    <link rel="manifest" href="{{ url_for('common_bp.LoginView:create_pwa_manifest',secret_uuid=g.account.uuid or '')}}">
+    
     <title>Hiddify | Panel</title>
-    <script type="module" crossorigin src="../static/new/assets/index-bd9ba5e9.js"></script>
+    <script type="module" crossorigin src="../static/new/assets/index-2cd90979.js"></script>
     <link rel="stylesheet" href="../static/new/assets/index-d9bbf489.css">
   </head>
   <body>

hiddifypanel/panel/user/user.py

@@ -24,7 +24,7 @@ class UserView(FlaskView):
         ua = request.user_agent.string
         print(ua)
         print(hiddify.get_user_agent())
-        return ua, 400
+        return ua
 
     def index(self):
         return self.auto_sub()
@@ -34,12 +34,65 @@ class UserView(FlaskView):
             return self.new()
         return self.get_proper_config() or self.all_configs(base64=True)
 
-    @route('/sub')
-    @route('/sub/')
+    # former /sub/ or /sub (it was auto actually but we named it as /sub/)
+    # TODO: @hiddify: check this out
+    @route('/auto/')
+    @route('/auto')
     @login_required(roles={Role.user})
     def force_sub(self):
         return self.get_proper_config() or self.all_configs(base64=False)
 
+    # region new endpoints
+    @route("/sub/")
+    @route("/sub")
+    @login_required(roles={Role.user})
+    def sub(self):
+        return self.all_configs(base64=False)
+
+    @route("/sub64/")
+    @route("/sub64")
+    @login_required(roles={Role.user})
+    def sub64(self):
+        return self.all_configs(base64=True)
+
+    @route("/singbox/")
+    @route("/singbox")
+    @login_required(roles={Role.user})
+    def singbox_full(self):
+        return self.full_singbox()
+
+    @route("/singbox-ssh/")
+    @route("/singbox-ssh")
+    @login_required(roles={Role.user})
+    def singbox_ssh(self):
+        return self.singbox()
+
+    @route("/clash/")
+    @route("/clash")
+    @login_required(roles={Role.user})
+    def clash(self):
+        return self.clash_config(meta_or_normal="normal")
+
+    @route("/clashmeta/")
+    @route("/clashmeta")
+    @login_required(roles={Role.user})
+    def clashmeta(self):
+        return self.clash_config(meta_or_normal="meta")
+    # endregion
+
+    @ route('/new/')
+    @ route('/new')
+    @login_required(roles={Role.user})
+    def new(self):
+        conf = self.get_proper_config()
+        if conf:
+            return conf
+
+        c = get_common_data(g.account.uuid, mode="new")
+        user_agent = user_agents.parse(request.user_agent.string)
+        # return render_template('home/multi.html', **c, ua=user_agent)
+        return render_template('new.html', **c, ua=user_agent)
+
     def get_proper_config(self):
         if g.user_agent['is_browser']:
             return None
@@ -59,20 +112,6 @@ class UserView(FlaskView):
         if re.match('^(Hiddify|FoXray|Fair|v2rayNG|SagerNet|Shadowrocket|V2Box|Loon|Liberty)', ua, re.IGNORECASE):
             return self.all_configs(base64=True)
 
-    @ route('/new/')
-    @ route('/new')
-    @login_required(roles={Role.user})
-    # @ route('/')
-    def new(self):
-        conf = self.get_proper_config()
-        if conf:
-            return conf
-
-        c = get_common_data(g.account.uuid, mode="new")
-        user_agent = user_agents.parse(request.user_agent.string)
-        # return render_template('home/multi.html', **c, ua=user_agent)
-        return render_template('new.html', **c, ua=user_agent)
-
     @ route('/clash/<meta_or_normal>/proxies.yml')
     @ route('/clash/proxies.yml')
     @login_required(roles={Role.user})
@@ -185,8 +224,8 @@ class UserView(FlaskView):
             resp = do_base_64(resp)
         return add_headers(resp, c)
 
-    @login_required(roles={Role.user})
     @ route("/offline.html")
+    @login_required(roles={Role.user})
     def offline():
         return f"Not Connected <a href='{hiddify.get_account_panel_link(g.account, request.host)}'>click for reload</a>"
 
@@ -307,7 +346,7 @@ def get_common_data(user_uuid, mode, no_domain=False, filter_domain=None):
         'ConfigEnum': ConfigEnum,
         'link_maker': link_maker,
         'domains': domains,
-        "bot": g.bot,
+        "bot": g.get('bot', None),
         "db_domain": db_domain,
         "telegram_enable": hconfig(ConfigEnum.telegram_enable) and any([d for d in domains if d.mode in [DomainType.direct, DomainType.relay, DomainType.old_xtls_direct]]),
         "ip": user_ip,
@@ -315,7 +354,7 @@ def get_common_data(user_uuid, mode, no_domain=False, filter_domain=None):
         "asn": asn,
         "country": auto_ip_selector.get_country(user_ip),
         'has_auto_cdn': has_auto_cdn,
-        'profile_url': hiddify.get_account_panel_link(g.account, domain)
+        'profile_url': hiddify.get_account_panel_link(g.account if g.get('account') else user, domain)
     }