hiddifypanel 9.0.0.dev21__py3-none-any.whl → 9.0.0.dev22__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-9.0.0.dev21
+9.0.0.dev22

hiddifypanel/VERSION.py

@@ -1,3 +1,3 @@
-__version__='9.0.0.dev21'
+__version__='9.0.0.dev22'
 from datetime import datetime
-__release_date__= datetime.strptime('2023-10-26','%Y-%m-%d')
+__release_date__= datetime.strptime('2023-10-30','%Y-%m-%d')

hiddifypanel/models/domain.py

@@ -8,6 +8,7 @@ from strenum import StrEnum
 from hiddifypanel.panel.database import db
 from .config import hconfig
 from .config_enum import ConfigEnum
+from sqlalchemy.orm import backref
 
 
 class DomainType(StrEnum):
@@ -47,7 +48,7 @@ class Domain(db.Model, SerializerMixin):
     show_domains = db.relationship('Domain', secondary=ShowDomain,
                                    primaryjoin=id == ShowDomain.c.domain_id,
                                    secondaryjoin=id == ShowDomain.c.related_id,
-                                   # backref=backref('show_domains', lazy='dynamic')
+                                   backref=backref('showed_by_domains', lazy='dynamic')
                                    )
 
     def __repr__(self):
@@ -76,7 +77,7 @@ class Domain(db.Model, SerializerMixin):
 
     @property
     def need_valid_ssl(self):
-        return self.mode in ['direct', 'cdn', 'worker', 'relay', 'auto_cdn_ip', 'old_xtls_direct', 'sub_link_only']
+        return self.mode in [DomainType.direct, DomainType.cdn, DomainType.worker, DomainType.relay, DomainType.auto_cdn_ip, DomainType.old_xtls_direct, DomainType.sub_link_only]
 
     @property
     def port_index(self):

hiddifypanel/panel/admin/DomainAdmin.py

@@ -1,6 +1,6 @@
 from hiddifypanel.models import *
 import re
-
+from hiddifypanel.panel.database import db
 from flask import Markup
 from flask import g, flash
 from flask_babelex import gettext as __
@@ -248,6 +248,9 @@ class DomainAdmin(AdminLTEModelView):
     def on_model_delete(self, model):
         if len(Domain.query.all()) <= 1:
             raise ValidationError(f"at least one domain should exist")
+        # ShowDomain.query.filter_by(related_id == model.id).delete()
+        model.showed_by_domains = []
+        # db.session.commit()
         hiddify.flash_config_success(restart_mode='apply', domain_changed=True)
 
     def after_model_delete(self, model):
@@ -260,7 +263,7 @@ class DomainAdmin(AdminLTEModelView):
             set_hconfig(ConfigEnum.first_setup, False)
         # if hconfig(ConfigEnum.parent_panel):
         #     hiddify_api.sync_child_to_parent()
-        if model.mode in [DomainType.direct, DomainType.cdn, DomainType.worker, DomainType.relay, DomainType.auto_cdn_ip, DomainType.old_xtls_direct, DomainType.sub_link_only]:
+        if model.need_valid_ssl():
             hiddify.exec_command(f"sudo /opt/hiddify-manager/acme.sh/get_cert.sh {model.domain}")
 
     def is_accessible(self):

hiddifypanel/panel/user/user.py

@@ -56,22 +56,16 @@ class UserView(FlaskView):
     @route('/mtproxies')
     def mtproxies(self):
         # get domains
-        domains = []
-        hdomains = get_hdomains()
-        if len(hdomains[DomainType.direct]):
-            domains += hdomains[DomainType.direct]
-        if len(hdomains[DomainType.relay]):
-            domains += hdomains[DomainType.relay]
+        c = get_common_data(g.user_uuid, 'new')
         mtproxies = []
         # TODO: Remove duplicated domains mapped to a same ipv4 and v6
-        for d in domains:
-            # create server link
-            hexuuid = hconfig(ConfigEnum.shared_secret).replace('-', '')
-            telegram_faketls_domain_hex = hconfig(
-                ConfigEnum.telegram_fakedomain).encode('utf-8').hex()
-            server_link = f'tg://proxy?server={d}&port=443&secret=ee{hexuuid}{telegram_faketls_domain_hex}'
-            # add server to data
-            mtproxies.append(server_link)
+        for d in c['domains']:
+            if d.mode not in [DomainType.direct, DomainType.relay]:
+                continue
+            hexuuid = hconfig(ConfigEnum.shared_secret, d.child_id).replace('-', '')
+            telegram_faketls_domain_hex = hconfig(ConfigEnum.telegram_fakedomain, d.child_id).encode('utf-8').hex()
+            server_link = f'tg://proxy?server={d.domain}&port=443&secret=ee{hexuuid}{telegram_faketls_domain_hex}'
+            mtproxies.append({'title': d.alias or d.domain, 'link': server_link})
 
         return jsonify(mtproxies)
 

hiddifypanel/translations/en/LC_MESSAGES/messages.po

@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HiddifyPanel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-26 12:05+0200\n"
-"PO-Revision-Date: 2023-10-26 05:01-0500\n"
+"POT-Creation-Date: 2023-10-30 09:11+0100\n"
+"PO-Revision-Date: 2023-10-26 06:24-0500\n"
 "Last-Translator: hidden u\n"
 "Language-Team: English (USA)\n"
 "Language: en_US\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Generated-By: Babel 2.12.1\n"
 
 # | msgid "This Domain does not exist in the Panel !"
-#: hiddifypanel/models/domain.py:158 hiddifypanel/panel/user/user.py:424
+#: hiddifypanel/models/domain.py:159 hiddifypanel/panel/user/user.py:418
 msgid "This domain does not exist in the panel!"
 msgstr "This Domain does not exist in the Panel !"
 
@@ -1426,28 +1426,28 @@ msgstr "ℹ️ Domain Fronting"
 
 # | msgid ""
 # | "It is used to simulate another website instead of your website in SNI. "
-# | "therefore, GTW Can not filter your domain"
+# | "therefore, GFW Can not filter your domain."
 #: hiddifypanel/panel/admin/templates/configfake.html:6
 #: hiddifypanel/templates/fake.html:1
 msgid "config.domain_fronting_domain.description"
 msgstr ""
 "It is used to simulate another website instead of your website in SNI. "
-"therefore, GTW Can not filter your domain"
+"therefore, GFW Can not filter your domain."
 
 # | msgid ""
 # | "It is used to simulate another website instead of your website in SNI. "
-# | "therefore, GTW can not filter your Domain\n"
+# | "therefore, GFW can not filter your Domain\n"
 # | "<a href=\"https://github.com/hiddify/hiddify-"
 # | "config/wiki/%D8%A7%D8%B3%D8%AA%D9%81%D8%A7%D8%AF%D9%87-%D8%A7%D8%B2-"
 # | "%D8%AF%D8%A7%D9%85%DB%8C%D9%86-"
 # | "%D9%81%D8%B1%D8%A7%D9%86%D8%AA%DB%8C%D9%86%DA%AF\">Guide</a>. "
-# | "⚠️CloudFlare does not support Domain Fronting. "
+# | "⚠️CloudFlare does not support Domain Fronting."
 #: hiddifypanel/panel/admin/templates/configfake.html:6
 #: hiddifypanel/templates/fake.html:2
 msgid "config.domain_fronting.description"
 msgstr ""
-"It is used to simulate another website instead of your website in SNI. therefore, GTW can not filter your Domain\n"
-"<a href=\"https://github.com/hiddify/hiddify-config/wiki/%D8%A7%D8%B3%D8%AA%D9%81%D8%A7%D8%AF%D9%87-%D8%A7%D8%B2-%D8%AF%D8%A7%D9%85%DB%8C%D9%86-%D9%81%D8%B1%D8%A7%D9%86%D8%AA%DB%8C%D9%86%DA%AF\">Guide</a>. ⚠️CloudFlare does not support Domain Fronting. "
+"It is used to simulate another website instead of your website in SNI. therefore, GFW can not filter your Domain\n"
+"<a href=\"https://github.com/hiddify/hiddify-config/wiki/%D8%A7%D8%B3%D8%AA%D9%81%D8%A7%D8%AF%D9%87-%D8%A7%D8%B2-%D8%AF%D8%A7%D9%85%DB%8C%D9%86-%D9%81%D8%B1%D8%A7%D9%86%D8%AA%DB%8C%D9%86%DA%AF\">Guide</a>. ⚠️CloudFlare does not support Domain Fronting."
 
 # | msgid "✔️ Enable Telegram MTProto"
 #: hiddifypanel/panel/admin/templates/configfake.html:6
@@ -2014,14 +2014,14 @@ msgid "config.reality_fallback_domain.label"
 msgstr "🌍 Reality Fallback Domain"
 
 # | msgid ""
-# | "When the GTW visit the Websites in Server names, it will be redirect to "
+# | "When the GFW visit the Websites in Server names, it will be redirect to "
 # | "this Domain."
 #: hiddifypanel/panel/admin/templates/configfake.html:6
 #: hiddifypanel/templates/fake.html:1
 #: hiddifypanel/templates/flaskadmin-layout.html:124
 msgid "config.reality_fallback_domain.description"
 msgstr ""
-"When the GTW visit the Websites in Server names, it will be redirect to this"
+"When the GFW visit the Websites in Server names, it will be redirect to this"
 " Domain."
 
 # | msgid "🔑 Private Key"
@@ -4270,16 +4270,15 @@ msgstr "🔒 Enable TLS Domain Fronting"
 
 # | msgid ""
 # | "It is used to simulate another website instead of your website in SNI. "
-# | "therefore, GTW can not filter your Domain\n"
+# | "therefore, GFW can not filter your Domain\n"
 # | "<a
 # href=\"https://github.com/hiddify/hiddify-config/wiki/Guide-for-domain-"
-# | "fronting\">Guide</a>. ⚠️CloudFlare does not support Domain Fronting. "
+# | "fronting\">Guide</a>. ⚠️CloudFlare does not support Domain Fronting."
 #: hiddifypanel/templates/flaskadmin-layout.html:129
-#, fuzzy
 msgid "domain.domain_fronting.description"
 msgstr ""
-"It is used to simulate another website instead of your website in SNI. therefore, GTW can not filter your Domain\n"
-"<a href=\"https://github.com/hiddify/hiddify-config/wiki/Guide-for-domain-fronting\">Guide</a>. ⚠️CloudFlare does not support Domain Fronting. "
+"It is used to simulate another website instead of your website in SNI. therefore, GFW can not filter your Domain\n"
+"<a href=\"https://github.com/hiddify/hiddify-config/wiki/Guide-for-domain-fronting\">Guide</a>. ⚠️CloudFlare does not support Domain Fronting."
 
 # | msgid "Close"
 #: hiddifypanel/templates/macros.html:29

hiddifypanel/translations/fa/LC_MESSAGES/messages.po

@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  HiddifyPanel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-26 12:05+0200\n"
-"PO-Revision-Date: 2023-10-26 05:01-0500\n"
+"POT-Creation-Date: 2023-10-30 09:11+0100\n"
+"PO-Revision-Date: 2023-10-26 06:24-0500\n"
 "Last-Translator: hidden u\n"
 "Language: fa\n"
 "Language-Team: Persian\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Generated-By: Babel 2.12.1\n"
 
 # | msgid "This Domain does not exist in the Panel !"
-#: hiddifypanel/models/domain.py:158 hiddifypanel/panel/user/user.py:424
+#: hiddifypanel/models/domain.py:159 hiddifypanel/panel/user/user.py:418
 msgid "This domain does not exist in the panel!"
 msgstr "این دامنه در پنل وجود ندارد!"
 
@@ -1460,7 +1460,7 @@ msgstr "ℹ️ دامین فرانتینگ"
 
 # | msgid ""
 # | "It is used to simulate another website instead of your website in SNI. "
-# | "therefore, GTW Can not filter your domain"
+# | "therefore, GFW Can not filter your domain."
 #: hiddifypanel/panel/admin/templates/configfake.html:6
 #: hiddifypanel/templates/fake.html:1
 msgid "config.domain_fronting_domain.description"
@@ -1470,10 +1470,10 @@ msgstr ""
 
 # | msgid ""
 # | "It is used to simulate another website instead of your website in SNI.
-# therefore, GTW can not filter your Domain\n"
+# therefore, GFW can not filter your Domain\n"
 # | "<a
 # href=\"https://github.com/hiddify/hiddify-config/wiki/%D8%A7%D8%B3%D8%AA%D9%81%D8%A7%D8%AF%D9%87-%D8%A7%D8%B2-%D8%AF%D8%A7%D9%85%DB%8C%D9%86-%D9%81%D8%B1%D8%A7%D9%86%D8%AA%DB%8C%D9%86%DA%AF\">Guide</a>.
-# ⚠️CloudFlare does not support Domain Fronting. "
+# ⚠️CloudFlare does not support Domain Fronting."
 #: hiddifypanel/panel/admin/templates/configfake.html:6
 #: hiddifypanel/templates/fake.html:2
 msgid "config.domain_fronting.description"
@@ -2071,7 +2071,7 @@ msgid "config.reality_fallback_domain.label"
 msgstr "🌍 دامنه بازگشتی ریالیتی"
 
 # | msgid ""
-# | "When the GTW visit the Websites in Server names, it will be redirect to
+# | "When the GFW visit the Websites in Server names, it will be redirect to
 # this"
 # | " Domain."
 #: hiddifypanel/panel/admin/templates/configfake.html:6
@@ -4450,10 +4450,10 @@ msgstr "🔒 فعال کردن دامین فرانتینگ در اتصال TLS"
 
 # | msgid ""
 # | "It is used to simulate another website instead of your website in SNI.
-# therefore, GTW can not filter your Domain\n"
+# therefore, GFW can not filter your Domain\n"
 # | "<a
 # href=\"https://github.com/hiddify/hiddify-config/wiki/Guide-for-domain-fronting\">Guide</a>.
-# ⚠️CloudFlare does not support Domain Fronting. "
+# ⚠️CloudFlare does not support Domain Fronting."
 #: hiddifypanel/templates/flaskadmin-layout.html:129
 msgid "domain.domain_fronting.description"
 msgstr ""