hiddifypanel 9.0.0.dev54__py3-none-any.whl → 9.0.0.dev61__py3-none-any.whl

hiddifypanel/panel/user/user.py

@@ -1,19 +1,22 @@
+import user_agents
+import datetime
+import random
+import re
 
-from flask import redirect, render_template, request, Response, g, url_for, jsonify, flash
+from flask import render_template, request, Response, g
 from apiflask import abort
-from hiddifypanel.hutils import auto_ip_selector
-import datetime
-from hiddifypanel.models import *
-from hiddifypanel.panel.database import db
-from hiddifypanel.panel import hiddify
 from . import link_maker
 from flask_classful import FlaskView, route
-import random
 from urllib.parse import urlparse
-import user_agents
 from flask_babelex import gettext as _
-import re
+
+
 from hiddifypanel.panel.auth import login_required
+from hiddifypanel.hutils import auto_ip_selector
+from hiddifypanel.panel.database import db
+from hiddifypanel.panel import hiddify
+from hiddifypanel.models import *
+from hiddifypanel import hutils
 
 
 class UserView(FlaskView):
@@ -24,7 +27,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 +37,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 +115,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})
@@ -90,6 +132,9 @@ class UserView(FlaskView):
     @ route('/report', methods=["POST"])
     @login_required(roles={Role.user})
     def report(self):
+
+        # THE REPORT MODEL IS NOT COMPLETED YET.
+
         data = request.get_json()
         user_ip = auto_ip_selector.get_real_user_ip()
         report = Report()
@@ -178,15 +223,15 @@ class UserView(FlaskView):
         if request.method == 'HEAD':
             resp = ""
         else:
-            # render_template('all_configs.txt', **c, base64=do_base_64)
+            # render_template('all_configs.txt', **c, base64=hutils.encode.do_base_64)
             resp = link_maker.make_v2ray_configs(**c)
 
         if base64:
-            resp = do_base_64(resp)
+            resp = hutils.encode.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>"
 
@@ -197,10 +242,10 @@ class UserView(FlaskView):
         return ""
 
 
-def do_base_64(str):
-    import base64
-    resp = base64.b64encode(f'{str}'.encode("utf-8"))
-    return resp.decode()
+# def do_base_64(str):
+#     import base64
+#     resp = base64.b64encode(f'{str}'.encode("utf-8"))
+#     return resp.decode()
 
 
 def get_common_data(user_uuid, mode, no_domain=False, filter_domain=None):
@@ -224,7 +269,7 @@ def get_common_data(user_uuid, mode, no_domain=False, filter_domain=None):
 
         if not db_domain:
             db_domain = DB(domain=domain, show_domains=[])
-            flash(_("This domain does not exist in the panel!" + domain))
+            hutils.flask.flash(_("This domain does not exist in the panel!" + domain))
 
         if mode == 'multi':
             domains = Domain.query.all()
@@ -262,7 +307,7 @@ def get_common_data(user_uuid, mode, no_domain=False, filter_domain=None):
                 d.cdn_ip, d.mode == DomainType.auto_cdn_ip, default_asn)
             # print("autocdn ip mode ", d.cdn_ip)
         if "*" in d.domain:
-            d.domain = d.domain.replace("*", hiddify.get_random_string(5, 15))
+            d.domain = d.domain.replace("*", hutils.random.get_random_string(5, 15))
 
     package_mode_dic = {
         UserMode.daily: 1,
@@ -307,7 +352,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 +360,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(user, domain)
     }
 
 
@@ -330,6 +375,6 @@ def add_headers(res, c):
     resp.headers['profile-update-interval'] = 1
     # resp.headers['content-disposition']=f'attachment; filename="{c["db_domain"].alias or c["db_domain"].domain} {c["user"].name}"'
 
-    resp.headers['profile-title'] = 'base64:'+do_base_64(c['profile_title'])
+    resp.headers['profile-title'] = 'base64:'+hutils.encode.do_base_64(c['profile_title'])
 
     return resp