hiddifypanel 10.50.4__py3-none-any.whl → 10.50.6.dev0__py3-none-any.whl

hiddifypanel/panel/admin/templates/config.html

@@ -26,7 +26,8 @@
 
 
 <div class="card">
-    <div class="card-header"><input id="search_settings" type="text" class="form-control" placeholder="{{_(" Search Settings")}}">
+    <div class="card-header"><input id="search_settings" type="text" class="form-control" placeholder="{{_(" Search
+            Settings")}}">
     </div>
     <div class="card-body">
         <div class="row">
@@ -81,6 +82,133 @@
 
 {% block tail %}
 {{super()}}
+<link rel="stylesheet" href="https://cdn.ckeditor.com/ckeditor5/42.0.2/ckeditor5.css">
+<style>
+    .ck.ck-editor {
+        color: black !important;
+    }
+</style>
+<script src="https://cdn.ckeditor.com/ckeditor5/42.0.2/ckeditor5.js"></script>
+
+<script type="importmap">
+    {
+        "imports": {
+            "ckeditor5": "https://cdn.ckeditor.com/ckeditor5/42.0.2/ckeditor5.js",
+            "ckeditor5/": "https://cdn.ckeditor.com/ckeditor5/42.0.2/"
+        }
+    }
+</script>
+<script type="module">
+    import {
+        ClassicEditor,
+        AccessibilityHelp,
+        Autosave,
+        BalloonToolbar,
+        Bold,
+        Code,
+        Essentials,
+        FontBackgroundColor,
+        FontColor,
+        FontFamily,
+        FontSize,
+        FullPage,
+        GeneralHtmlSupport,
+        Highlight,
+        HtmlComment,
+        HtmlEmbed,
+        Italic,
+        Paragraph,
+        SelectAll,
+        ShowBlocks,
+        SourceEditing,
+        SpecialCharacters,
+        Strikethrough,
+        ImageBlock,
+        ImageInsert,
+        ImageInsertViaUrl,
+        ImageToolbar,
+
+        Underline,
+        Undo
+    } from 'ckeditor5';
+
+    const editorConfig = {
+        toolbar: {
+            items: [
+                'undo',
+                'redo',
+                '|',
+                'bold',
+                'italic',
+                'underline',
+                'strikethrough',
+                'code',
+                'insertImage',
+                '|',
+                'fontSize',
+                'fontColor',
+                'fontBackgroundColor',
+                '|',
+                'sourceEditing',
+
+            ],
+            shouldNotGroupWhenFull: false
+        },
+        plugins: [
+            AccessibilityHelp,
+            Autosave,
+            BalloonToolbar,
+            Bold,
+            Code,
+            Essentials,
+            FontBackgroundColor,
+            FontColor,
+            FontFamily,
+            FontSize,
+            FullPage,
+            GeneralHtmlSupport,
+            Highlight,
+            HtmlComment,
+            HtmlEmbed,
+            Italic,
+            Paragraph,
+            SelectAll,
+            ShowBlocks,
+            SourceEditing,
+            ImageBlock,
+            ImageInsertViaUrl,
+
+            Strikethrough,
+            Underline,
+            Undo
+        ],
+        balloonToolbar: ['bold', 'italic'],
+        fontFamily: {
+            supportAllValues: true
+        },
+        fontSize: {
+            options: [10, 12, 14, 'default', 18, 20, 22],
+            supportAllValues: true
+        },
+        htmlSupport: {
+            allow: [
+                {
+                    name: /^.*$/,
+                    styles: true,
+                    attributes: true,
+                    classes: true
+                }
+            ]
+        },
+
+        placeholder: 'Type or paste your content here!'
+    };
+
+    ClassicEditor.create(document.querySelector('.ckeditor'), editorConfig);
+
+
+</script>
+
 <script>
     // $("fieldset .form-group").hide()
 

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

@@ -5,7 +5,7 @@ from marshmallow import Schema, fields
 
 from apiflask import APIBlueprint
 from flask_restful import Api
-from .tgbot import bot, register_bot, TGBotResource
+from .tgbot import bot, register_bot, register_bot_cached, TGBotResource
 from . import tgbot
 from .tgmsg import SendMsgResource
 from .resources import *

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

@@ -5,6 +5,7 @@ from flask_restful import Resource
 
 from hiddifypanel.models import *
 from hiddifypanel import Events
+from hiddifypanel.cache import cache
 logger = telebot.logger
 
 
@@ -17,6 +18,11 @@ bot = telebot.TeleBot("", parse_mode="HTML", threaded=False, exception_handler=E
 bot.username = ''
 
 
+@cache.cache(1000)
+def register_bot_cached(set_hook=False, remove_hook=False):
+    return register_bot(set_hook, remove_hook)
+
+
 def register_bot(set_hook=False, remove_hook=False):
     try:
         global bot

hiddifypanel/panel/commercial/restapi/v2/admin/user_api.py

@@ -35,8 +35,8 @@ class UserApi(MethodView):
         for field in User.__table__.columns.keys():  # type: ignore
             if field in ['id', 'expiry_time']:
                 continue
-            if field not in data:
-                data[field] = getattr(user, field)
+            # if field in data:
+            #     setattr(user, field, data[field])
         data['old_uuid'] = uuid
         user_driver.remove_client(user)
         dbuser = User.add_or_update(**data) or abort(502, "Unknown issue! User is not patched")

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

@@ -108,7 +108,15 @@ class AllConfigsAPI(MethodView):
                 )
             )
 
-        # Add Singbox: SSh
+        if hconfig(ConfigEnum.wireguard_enable):
+            items.append(
+                create_item(
+                    "Wireguard", "Wireguard", "", "", "", "",
+                    # 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}wireguard/#{config_name}"
+                )
+            )
+            # Add Singbox: SSh
         if hconfig(ConfigEnum.sub_singbox_ssh_enable) and hconfig(ConfigEnum.ssh_server_enable):
             items.append(
                 create_item(

hiddifypanel/panel/commercial/telegrambot/__init__.py

@@ -1,4 +1,4 @@
-from hiddifypanel.panel.commercial.restapi.v1 import bot, register_bot
+from hiddifypanel.panel.commercial.restapi.v1 import bot, register_bot, register_bot_cached
 
 from . import Usage
 from . import information

hiddifypanel/panel/common.py

@@ -10,6 +10,7 @@ import hiddifypanel.auth as auth
 from hiddifypanel.auth import current_account
 from apiflask import APIFlask, HTTPError, abort
 from hiddifypanel import hutils
+from loguru import logger
 
 
 def init_app(app: APIFlask):
@@ -36,6 +37,7 @@ def init_app(app: APIFlask):
 
     @app.errorhandler(Exception)
     def internal_server_error(e):
+        logger.exception(e)
         if isinstance(e, Exception):
             if hutils.flask.is_api_call(request.path):
                 return {
@@ -181,4 +183,4 @@ def init_app(app: APIFlask):
     with app.app_context():
         import hiddifypanel.panel.commercial.telegrambot as telegrambot
         if (not telegrambot.bot) or (not telegrambot.bot.username):  # type: ignore
-            telegrambot.register_bot(set_hook=True)
+            telegrambot.register_bot_cached(set_hook=True)

hiddifypanel/panel/custom_widgets.py

@@ -47,6 +47,8 @@ class LastResetField(IntegerField):
 
 
 class CKTextAreaWidget(TextArea):
+    extra_js = ['//cdn.ckeditor.com/4.6.0/standard/ckeditor.js']
+
     def __call__(self, field, **kwargs):
         if kwargs.get('class'):
             kwargs['class'] += ' ckeditor'
@@ -56,6 +58,7 @@ class CKTextAreaWidget(TextArea):
 
 
 class CKTextAreaField(TextAreaField):
+    extra_js = ['//cdn.ckeditor.com/4.6.0/standard/ckeditor.js']
     widget = CKTextAreaWidget()
 
 

hiddifypanel/panel/hiddify.py

@@ -110,17 +110,20 @@ def reinstall_action(complete_install=False, domain_changed=False, do_update=Fal
 def check_need_reset(old_configs, do=False):
     restart_mode = ApplyMode.nothing
     for c in old_configs:
+        if c.apply_mode == ApplyMode.nothing:
+            continue
         # c=ConfigEnum(c)
-        if old_configs[c] != hconfig(c) and c.apply_mode != ApplyMode.nothing:
-            if restart_mode != ApplyMode.restart:
-                restart_mode = c.apply_mode
+        if restart_mode == ApplyMode.reinstall:
+            break
+        if old_configs[c] != hconfig(c):
+            restart_mode = c.apply_mode
     if old_configs[ConfigEnum.proxy_path_admin] != hconfig(ConfigEnum.proxy_path_admin):
         g.new_proxy_path = hconfig(ConfigEnum.proxy_path_admin)
         g.force_proxy_path = g.proxy_path
     # do_full_install=old_config[ConfigEnum.telegram_lib]!=hconfig(ConfigEnum.telegram_lib)
     if old_configs[ConfigEnum.package_mode] != hconfig(ConfigEnum.package_mode):
         return reinstall_action(do_update=True)
-    if not (do and restart_mode == ApplyMode.restart):
+    if not (do and restart_mode == ApplyMode.reinstall):
         return hutils.flask.flash_config_success(restart_mode=restart_mode, domain_changed=False)
 
     return reinstall_action(complete_install=True, domain_changed=False)

hiddifypanel/panel/init_db.py

@@ -12,12 +12,55 @@ from hiddifypanel.models import *
 from hiddifypanel.panel import hiddify
 from hiddifypanel.database import db, db_execute
 from flask import g
-from sqlalchemy import text
+from sqlalchemy import func, text
 from loguru import logger
 MAX_DB_VERSION = 100
 
 
-def _v88(child_id):
+def _v91(child_id):
+    db.session.bulk_save_objects(get_proxy_rows_v1())
+
+
+def _v90(child_id):
+    result = (
+        db.session.query(
+            DailyUsage.child_id,
+            DailyUsage.admin_id,
+            DailyUsage.date,
+            func.max(DailyUsage.online).label('online'),
+            func.sum(DailyUsage.usage).label('usage'),
+            func.count(DailyUsage.usage).label('count'),
+        )
+        .group_by(DailyUsage.child_id, DailyUsage.admin_id, DailyUsage.date)
+        .all()
+    )
+
+    for r in result:
+        if r.count > 1:
+            # Delete existing records for this group
+            db.session.query(DailyUsage).filter(
+                DailyUsage.child_id == r.child_id,
+                DailyUsage.admin_id == r.admin_id,
+                DailyUsage.date == r.date
+            ).delete()
+
+            # Add the aggregated record
+            new_record = DailyUsage(
+                child_id=r.child_id,
+                admin_id=r.admin_id,
+                date=r.date,
+                online=r.online,
+                usage=r.usage
+            )
+            db.session.add(new_record)
+
+    # Commit the changes to the database
+    db.session.commit()
+
+
+def _v89(child_id):
+    set_hconfig(ConfigEnum.path_splithttp, hutils.random.get_random_string(7, 15))
+    set_hconfig(ConfigEnum.splithttp_enable, False)
     pass
 
 
@@ -471,6 +514,9 @@ def get_proxy_rows_v1():
         "httpupgrade direct vless",
         # "httpupgrade direct trojan",
         "httpupgrade direct vmess",
+        "splithttp direct vless",
+        "splithttp direct trojan",
+        "splithttp direct vmess",
         "tcp direct vless",
         "tcp direct trojan",
         "tcp direct vmess",
@@ -487,6 +533,11 @@ def get_proxy_rows_v1():
         "httpupgrade relay vless",
         # "httpupgrade relay trojan",
         "httpupgrade relay vmess",
+
+        "splithttp relay vless",
+        "splithttp relay trojan",
+        "splithttp relay vmess",
+
         "tcp relay vless",
         "tcp relay trojan",
         "tcp relay vmess",
@@ -506,6 +557,11 @@ def get_proxy_rows_v1():
         "httpupgrade CDN vless",
         # "httpupgrade CDN trojan",
         "httpupgrade CDN vmess",
+
+        "splithttp CDN vless",
+        "splithttp CDN trojan",
+        "splithttp CDN vmess",
+
         "grpc CDN vless",
         "grpc CDN trojan",
         "grpc CDN vmess",

hiddifypanel/panel/usage.py

@@ -7,14 +7,24 @@ from hiddifypanel.drivers import user_driver
 from hiddifypanel.models import *
 from hiddifypanel.panel import hiddify
 from hiddifypanel.database import db
-from hiddifypanel import hutils
+from hiddifypanel import cache, hutils
 
 to_gig_d = 1024**3
 
 
 def update_local_usage():
-    res = user_driver.get_users_usage(reset=True)
-    return _add_users_usage(res, child_id=0)
+    lock_key = "lock-update-local-usage"
+    if not cache.redis_client.set(lock_key, "locked", nx=True, ex=600):
+        return {"msg": "last update task is not finished yet."}
+    try:
+        res = user_driver.get_users_usage(reset=True)
+        # cache.redis_client.delete(lock_key)
+        cache.redis_client.set(lock_key, "locked", nx=False, ex=60)
+        return _add_users_usage(res, child_id=0)
+    except Exception as e:
+        cache.redis_client.set(lock_key, "locked", nx=False, ex=60)
+        raise
+        return {"msg": f"Exception in update usage: {e}"}
 
     # return {"status": 'success', "comments":res}
 
@@ -53,26 +63,30 @@ def _add_users_usage(users_usage_data: Dict[User, Dict], child_id, sync=False):
 
     daily_usage = {}
     today = datetime.date.today()
+    changes = False
     for adm in AdminUser.query.all():
         daily_usage[adm.id] = DailyUsage.query.filter(DailyUsage.date == today, DailyUsage.admin_id == adm.id, DailyUsage.child_id == child_id).first()
-        if not daily_usage[adm.id]:
+        if daily_usage[adm.id] is None:
             daily_usage[adm.id] = DailyUsage(admin_id=adm.id, child_id=child_id)
             db.session.add(daily_usage[adm.id])
+            changes = True
         daily_usage[adm.id].online = User.query.filter(User.added_by == adm.id).filter(func.DATE(User.last_online) == today).count()
-
+    # if changes:
+    #     db.session.commit()
     _reset_priodic_usage()
 
-    userDetails = {p.user_id: p for p in UserDetail.query.filter(UserDetail.child_id == child_id).all()}
+    # userDetails = {p.user_id: p for p in UserDetail.query.filter(UserDetail.child_id == child_id).all()}
     for user, uinfo in users_usage_data.items():
         usage_bytes = uinfo['usage']
 
         # UserDetails things
-        detail = userDetails.get(user.id)
-        if not detail:
-            detail = UserDetail(user_id=user.id, child_id=child_id)
-            db.session.add(detail)
-        if uinfo['devices'] != detail.connected_devices:
-            detail.connected_devices = uinfo['devices']
+        # detail = UserDetail(user_id=user.id, child_id=child_id)
+        # detail = userDetails.get(user.id)
+        # if not detail:
+        #     detail = UserDetail(user_id=user.id, child_id=child_id)
+        #     db.session.add(detail)
+        # if uinfo['devices'] != detail.connected_devices:
+        #     detail.connected_devices = uinfo['devices']
 
         # Enable the user if isn't already
         if not before_enabled_users[user.uuid] and user.is_active:
@@ -99,12 +113,12 @@ def _add_users_usage(users_usage_data: Dict[User, Dict], child_id, sync=False):
                 # detail.current_usage_GB = in_gig
             else:
                 user.current_usage += in_bytes
-                detail.current_usage = detail.current_usage or 0
-                detail.current_usage += in_bytes
+                # detail.current_usage = detail.current_usage or 0
+                # detail.current_usage += in_bytes
 
             # Change last online time of the user
             user.last_online = datetime.datetime.now()
-            detail.last_online = datetime.datetime.now()
+            # detail.last_online = datetime.datetime.now()
 
             # Set start date of user to the current datetime if it hasn't been set already
             if user.start_date is None:
@@ -142,7 +156,7 @@ def _add_users_usage(users_usage_data: Dict[User, Dict], child_id, sync=False):
     if not sync and hutils.node.is_child():
         hutils.node.child.sync_users_usage_with_parent()
 
-    return {"status": 'success', "comments": res, "date": datetime.datetime.now()}
+    return {"status": 'success', "comments": res, "date": hutils.convert.time_to_json(datetime.datetime.now())}
 
 
 def send_bot_message(user):

hiddifypanel/panel/user/user.py

@@ -73,6 +73,44 @@ class UserView(FlaskView):
         '''Returns singbox client JSON config (ssh)'''
         return self.singbox_ssh_imp()
 
+    @route("/wireguard/")
+    @route("/wireguard")
+    @login_required(roles={Role.user})
+    def wireguard(self):
+        '''Returns wireguard client config'''
+        c = get_common_data(g.account.uuid, 'new')
+        wireguards = []
+        servers = set()
+        for pinfo in hutils.proxy.get_valid_proxies(c['domains']):
+            if pinfo['proto'] != ProxyProto.wireguard:
+                continue
+            wireguards.append(pinfo)
+
+            servers.add(pinfo['server'])
+
+        if not len(wireguards):
+            abort(404)
+        wg = wireguards[0]
+        addrs = f"{wg['wg_ipv4']}/32"
+        if wg['wg_ipv6']:
+            addrs += f", {wg['wg_ipv6']}/128"
+        resp = f"""
+[Interface]
+PrivateKey = {wg['wg_pk']}
+Address = {addrs}
+DNS = 1.1.1.1
+MTU = 1390
+
+[Peer]
+PublicKey = {wg['wg_pub']}
+PresharedKey = {wg['wg_psk']}
+AllowedIPs = 0.0.0.0/1, 128.0.0.0/1, ::/1, 8000::/1
+Endpoint = {next(iter(servers))}:61339 #{servers}
+"""
+        return add_headers(resp, c)
+
+        # return self.singbox_ssh_imp()
+
     @route("/clash/")
     @route("/clash")
     @login_required(roles={Role.user})

hiddifypanel/templates/fake.html

@@ -212,6 +212,8 @@
 {{_("config.grpc_enable.description")}}
 {{_("config.httpupgrade_enable.label")}}
 {{_("config.httpupgrade_enable.description")}}
+{{_("config.splithttp_enable.label")}}
+{{_("config.splithttp_enable.description")}}
 {{_("config.vless_enable.label")}}
 {{_("config.vless_enable.description")}}
 {{_("config.trojan_enable.label")}}
@@ -248,6 +250,8 @@
 {{_("config.path_v2ray.description")}}
 {{_("config.path_ss.label")}}
 {{_("config.path_ss.description")}}
+{{_("config.path_splithttp.label")}}
+{{_("config.path_splithttp.description")}}
 {{_("config.path_httpupgrade.label")}}
 {{_("config.path_httpupgrade.description")}}
 {{_("config.path_ws.label")}}

hiddifypanel/translations/en/LC_MESSAGES/messages.po

@@ -2,8 +2,12 @@
 msgid ""
 msgstr ""
 
-msgid " Search Settings"
-msgstr " Search Settings"
+msgid ""
+" Search\n"
+"            Settings"
+msgstr ""
+" Search\n"
+"            Settings"
 
 msgid "%(count)s records were successfully disabled."
 msgstr "%(count)s records were successfully disabled."
@@ -670,6 +674,9 @@ msgstr "Select this option to restore All Users"
 msgid "Root"
 msgstr "Root"
 
+msgid "Russia"
+msgstr "Russia"
+
 msgid "Save"
 msgstr "Save"
 
@@ -1638,6 +1645,12 @@ msgstr "should be random"
 msgid "config.path_httpupgrade.label"
 msgstr "ℹ️ HTTP Upgrade Path"
 
+msgid "config.path_splithttp.description"
+msgstr "config.path_splithttp.description"
+
+msgid "config.path_splithttp.label"
+msgstr "config.path_splithttp.label"
+
 msgid "config.path_ss.description"
 msgstr "Shadowsocks Path in the Links"
 
@@ -1858,6 +1871,12 @@ msgstr ""
 msgid "config.speed_test.label"
 msgstr "🚀 Speed Test"
 
+msgid "config.splithttp_enable.description"
+msgstr "config.splithttp_enable.description"
+
+msgid "config.splithttp_enable.label"
+msgstr "config.splithttp_enable.label"
+
 msgid "config.ssfaketls.description"
 msgstr ""
 "Shadowsocks FakeTLS is a simple obfusacting tool that encapsulate the date "

hiddifypanel/translations/fa/LC_MESSAGES/messages.po

@@ -2,8 +2,10 @@
 msgid ""
 msgstr ""
 
-msgid " Search Settings"
-msgstr " تنظیمات جستجو"
+msgid ""
+" Search\n"
+"            Settings"
+msgstr ""
 
 msgid "%(count)s records were successfully disabled."
 msgstr "%(count)s رکورد با موفقیت غیرفعال شد."
@@ -654,6 +656,9 @@ msgstr "برای بازگرداندن کاربران از این گزینه اس
 msgid "Root"
 msgstr "ریشه"
 
+msgid "Russia"
+msgstr ""
+
 msgid "Save"
 msgstr "ذخیره"
 
@@ -1635,6 +1640,12 @@ msgstr "باید تصادفی باشد"
 msgid "config.path_httpupgrade.label"
 msgstr "ℹ️ مسیر ارتقاء HTTP"
 
+msgid "config.path_splithttp.description"
+msgstr ""
+
+msgid "config.path_splithttp.label"
+msgstr ""
+
 msgid "config.path_ss.description"
 msgstr "مسیر شدوساکس در لینکها"
 
@@ -1859,6 +1870,12 @@ msgstr ""
 msgid "config.speed_test.label"
 msgstr "🚀 تست سرعت"
 
+msgid "config.splithttp_enable.description"
+msgstr ""
+
+msgid "config.splithttp_enable.label"
+msgstr ""
+
 msgid "config.ssfaketls.description"
 msgstr ""
 "شادوساکس FakeTLS یک روش مبهم سازی ساده هست که دیتا را در بسته  TLS کپسوله "

hiddifypanel/translations/pt/LC_MESSAGES/messages.po

@@ -2,8 +2,10 @@
 msgid ""
 msgstr ""
 
-msgid " Search Settings"
-msgstr " Configurações de pesquisa"
+msgid ""
+" Search\n"
+"            Settings"
+msgstr ""
 
 msgid "%(count)s records were successfully disabled."
 msgstr "%(count)s registros foram desativados com sucesso."
@@ -609,6 +611,9 @@ msgstr "Selecione esta opção para restaurar todos os usuários"
 msgid "Root"
 msgstr "Raíz"
 
+msgid "Russia"
+msgstr ""
+
 msgid "Save"
 msgstr "Salvar"
 
@@ -1568,6 +1573,12 @@ msgstr ""
 msgid "config.path_httpupgrade.label"
 msgstr ""
 
+msgid "config.path_splithttp.description"
+msgstr ""
+
+msgid "config.path_splithttp.label"
+msgstr ""
+
 msgid "config.path_ss.description"
 msgstr "Caminho Shadowsocks nos Links"
 
@@ -1785,6 +1796,12 @@ msgstr ""
 msgid "config.speed_test.label"
 msgstr "🚀 Teste de velocidade"
 
+msgid "config.splithttp_enable.description"
+msgstr ""
+
+msgid "config.splithttp_enable.label"
+msgstr ""
+
 msgid "config.ssfaketls.description"
 msgstr ""
 "Shadowsocks FakeTLS é uma ferramenta de ofuscação simples que encapsula a "