hiddifypanel 10.50.2__py3-none-any.whl → 10.50.4__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-10.50.2
+10.50.4

hiddifypanel/VERSION.py

@@ -1,3 +1,3 @@
-__version__='10.50.2'
+__version__='10.50.4'
 from datetime import datetime
-__release_date__= datetime.strptime('2024-07-14','%Y-%m-%d')
+__release_date__= datetime.strptime('2024-07-17','%Y-%m-%d')

hiddifypanel/drivers/xray_api.py

@@ -10,27 +10,35 @@ class XrayApi(DriverABS):
         return hconfig(ConfigEnum.core_type) == "xray"
 
     def get_xray_client(self):
-        return xtlsapi.XrayClient('127.0.0.1', 10085)
+        if not hasattr(self, 'xray_client'):
+            self.xray_client = xtlsapi.XrayClient('127.0.0.1', 10085)
+        return self.xray_client
 
     def get_enabled_users(self):
         xray_client = self.get_xray_client()
         usages = xray_client.stats_query('user', reset=True)
         res = defaultdict(int)
+        tags = set(self.get_inbound_tags())
         for use in usages:
             if "user>>>" not in use.name:
                 continue
             uuid = use.name.split(">>>")[1].split("@")[0]
-            try:
-                t = "xtls"
-                protocol = "vless"
-                xray_client.add_client(t, f'{uuid}', f'{uuid}@hiddify.com', protocol=protocol, flow='xtls-rprx-vision', alter_id=0, cipher='chacha20_poly1305')
-                xray_client.remove_client(t, f'{uuid}@hiddify.com')
-                res[uuid] = 0
-            except xtlsapi.xtlsapi.exceptions.EmailAlreadyExists as e:
-                res[uuid] = 1
-            except Exception as e:
-                print(f"error {e}")
-                res[uuid] = 0
+
+            for t in tags.copy():
+                try:
+                    self.__add_uuid_to_tag(uuid, t)
+                    self._remove_client(uuid, [t], False)
+                    # print(f"Success add  {uuid} {t}")
+                    res[uuid] = 0
+                except ValueError:
+                    # tag invalid
+                    tags.remove(t)
+                    pass
+                except xtlsapi.xtlsapi.exceptions.EmailAlreadyExists as e:
+                    res[uuid] = 1
+                except Exception as e:
+                    print(f"error {e}")
+                    res[uuid] = 0
 
         return res
 
@@ -63,10 +71,8 @@ class XrayApi(DriverABS):
             inbounds = {}
         return list(inbounds)
 
-    def add_client(self, user):
-        uuid = user.uuid
+    def __add_uuid_to_tag(self, uuid, t):
         xray_client = self.get_xray_client()
-        tags = self.get_inbound_tags()
         proto_map = {
             'vless': 'vless',
             'realityin': 'vless',
@@ -88,17 +94,27 @@ class XrayApi(DriverABS):
                     res = p, protocol
                     break
             return res
+        p, protocol = proto(t)
+        if not p:
+            raise ValueError("incorrect tag")
+        if (protocol == "vless" and p != "xtls" and p != "realityin") or "realityingrpc" in t:
+            xray_client.add_client(t, f'{uuid}', f'{uuid}@hiddify.com', protocol=protocol, flow='\0',)
+        else:
+            xray_client.add_client(t, f'{uuid}', f'{uuid}@hiddify.com', protocol=protocol,
+                                   flow='xtls-rprx-vision', alter_id=0, cipher='chacha20_poly1305')
+
+    def add_client(self, user):
+        uuid = user.uuid
+        xray_client = self.get_xray_client()
+        tags = self.get_inbound_tags()
+
         for t in tags:
             try:
-                p, protocol = proto(t)
-                if not p:
-                    continue
-                if (protocol == "vless" and p != "xtls" and p != "realityin") or "realityingrpc" in t:
-                    xray_client.add_client(t, f'{uuid}', f'{uuid}@hiddify.com', protocol=protocol, flow='\0',)
-                else:
-                    xray_client.add_client(t, f'{uuid}', f'{uuid}@hiddify.com', protocol=protocol,
-                                           flow='xtls-rprx-vision', alter_id=0, cipher='chacha20_poly1305')
+                self.__add_uuid_to_tag(uuid, t)
                 # print(f"Success add  {uuid} {t}")
+            except ValueError:
+                # tag invalid
+                pass
             except Exception as e:
                 # print(f"error in add  {uuid} {t} {e}")
                 pass
@@ -106,16 +122,18 @@ class XrayApi(DriverABS):
     def remove_client(self, user):
         return self._remove_client(user.uuid)
 
-    def _remove_client(self, uuid):
+    def _remove_client(self, uuid, tags=None, dolog=True):
         xray_client = self.get_xray_client()
-        tags = self.get_inbound_tags()
+        tags = tags or self.get_inbound_tags()
 
         for t in tags:
             try:
                 xray_client.remove_client(t, f'{uuid}@hiddify.com')
-                print(f"Success remove  {uuid} {t}")
+                if dolog:
+                    print(f"Success remove  {uuid} {t}")
             except Exception as e:
-                print(f"error in remove  {uuid} {t} {e}")
+                if dolog:
+                    print(f"error in remove  {uuid} {t} {e}")
                 pass
 
     def get_all_usage(self, users):

hiddifypanel/panel/admin/DomainAdmin.py

@@ -298,7 +298,7 @@ class DomainAdmin(AdminLTEModelView):
     def after_model_change(self, form, model, is_created):
         if hconfig(ConfigEnum.first_setup):
             set_hconfig(ConfigEnum.first_setup, False)
-        if model.need_valid_ssl:
+        if model.need_valid_ssl and "*" not in model.domain:
             commander(Command.get_cert, domain=model.domain)
         if hutils.node.is_child():
             hutils.node.run_node_op_in_bg(hutils.node.child.sync_with_parent, *[hutils.node.child.SyncFields.domains])

hiddifypanel/panel/usage.py

@@ -142,11 +142,11 @@ 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}
+    return {"status": 'success', "comments": res, "date": datetime.datetime.now()}
 
 
 def send_bot_message(user):
-    if not (hconfig(ConfigEnum.telegram_bot_token) or not hutils.node.is_parent()):
+    if not (hconfig(ConfigEnum.telegram_bot_token) or hutils.node.is_child()):
         return
     if not user.telegram_id:
         return

{hiddifypanel-10.50.2.dist-info → hiddifypanel-10.50.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 10.50.2
+Version: 10.50.4
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-manager/
 Author: hiddify

{hiddifypanel-10.50.2.dist-info → hiddifypanel-10.50.4.dist-info}/RECORD

@@ -1,6 +1,6 @@
 hiddifypanel/Events.py,sha256=AlnRdjVul0jP-NCT4-zoaQgowoOo-JhdQB4ytetAFKA,723
-hiddifypanel/VERSION,sha256=DUQBdAOuAKfJ37rMnpDFMV7J2msDNY7x1Dv50pMNn0g,8
-hiddifypanel/VERSION.py,sha256=iZZ7yX2w_Q3Kd4KmcGadd8ZNYUoS7wvI3OEVwDkrVTk,113
+hiddifypanel/VERSION,sha256=c8o1H6F8_MJrq8OoHtctcdt1Tlav-7m4mOsjT_52d0k,8
+hiddifypanel/VERSION.py,sha256=AwGQ8abu2uzm8LWxg399AxCsnBzepfeKDLV060mI_XM,113
 hiddifypanel/__init__.py,sha256=aLukp3ORszdcH4G9J-MlxhjHN6yFlOuOE6mm-L3aG_g,266
 hiddifypanel/__main__.py,sha256=IVchnXpK6bm8T3N--mN17HBQNLMeLAjyP7iwzULexB4,218
 hiddifypanel/auth.py,sha256=Xq0UwiFTRFmQpxnOehQGwPDlJqoelwGhPQbYZ0Xn5c0,7850
@@ -12,7 +12,7 @@ hiddifypanel/drivers/singbox_api.py,sha256=gdP_RM8b7qvDpN9RzUyJJ9i_MtMOpATx0LVDL
 hiddifypanel/drivers/ssh_liberty_bridge_api.py,sha256=m74JOYu7Pkt1bNvKlAAroea1QyxSfhf1bBMbtyf3VJA,2220
 hiddifypanel/drivers/user_driver.py,sha256=3xm5xGJXULo6Mb8KCMqUb4BxUTYSGCctn8k7gSbVM8w,2036
 hiddifypanel/drivers/wireguard_api.py,sha256=zBC7tlVRgQQC2BJzmwfFKIcNXcfBenpVgD5OGzh7AI4,3640
-hiddifypanel/drivers/xray_api.py,sha256=2Dd9UUi0y_dOiZ-8oQ_uHn-9Wk5H468er0i5TWBxDMU,5393
+hiddifypanel/drivers/xray_api.py,sha256=b6f8q2oYZaWqsjaR7t_OAzE7gIjsSdpd4Z1a3i_0BcI,5869
 hiddifypanel/hutils/__init__.py,sha256=eHFBeXrTwiW3sb0ojTJNG_J26uiwyBoZ9O-W2lQKmeo,296
 hiddifypanel/hutils/auth.py,sha256=Ci3_lBfLXx1yi2M6HvYX3ceHYtOf-cfX092evcs8528,3030
 hiddifypanel/hutils/convert.py,sha256=mPEDzR64hKeQ4B_tZRk2Ci8-Ybod0bjX0BbxLHOmLZA,2075
@@ -65,13 +65,13 @@ hiddifypanel/panel/custom_widgets.py,sha256=9qI_fNX8NKqB1r8ljgcaisGZaDM89_PM_rOB
 hiddifypanel/panel/hiddify.py,sha256=Tj2WSjNrlRJ3yahFINCTQSn36ygBgFB3SQRr9MegLuE,15572
 hiddifypanel/panel/init_db.py,sha256=wewSjqu9LwvD9UiTtrAe4Y6BVl6EjzxwZ7ONUxwaWes,33397
 hiddifypanel/panel/run_commander.py,sha256=D9y-My0xSe2adHWXKV5UPYGl-9WwKURzniq55MRu6tE,3259
-hiddifypanel/panel/usage.py,sha256=LBmM5pKPbCxBxFozPjrXIypNVMlBn4ZyO46t5VBCNKg,6137
+hiddifypanel/panel/usage.py,sha256=XwwgUTP63yI9dxzJqQomwhB8GvYuN3eqvsMXUkk3qGE,6165
 hiddifypanel/panel/admin/Actions.py,sha256=yRMKuCZ7J8F8KLlIfFUTYhdL19zVC_tujzZUWmTmCOA,8573
 hiddifypanel/panel/admin/AdminstratorAdmin.py,sha256=eUUe5b8bGPj2nZstKkwK3lhqBhMixyAbzEMvZAp0I2k,10231
 hiddifypanel/panel/admin/Backup.py,sha256=BKSoAZgw1j16P1Jh9vMqGj7ZfB2m-WafDK0C5vil5FY,3634
 hiddifypanel/panel/admin/ConfigAdmin.py,sha256=0hnLY-8BxrpVnrAcQaedWjHnRUq1X_Styi_ZCZ2ivds,2876
 hiddifypanel/panel/admin/Dashboard.py,sha256=JOqZLHxPOYKQYQVJ7AtHAkilH-anJZQyK1rQrgCJUeA,3798
-hiddifypanel/panel/admin/DomainAdmin.py,sha256=hORvsng-7m-r4bPS866g1AxI2eU1lmisrK5QD2p5py0,15790
+hiddifypanel/panel/admin/DomainAdmin.py,sha256=5_2kENoloSPqNNy1FC9pqHqcLOMaef56HZWSBHY_PEc,15818
 hiddifypanel/panel/admin/NodeAdmin.py,sha256=QAHQjF7e7F4KqsWNWpMt7SoLANlFEborVtWQV9OXJ2E,3102
 hiddifypanel/panel/admin/ProxyAdmin.py,sha256=jiay6e9Eyi_-VgWORBLgCAyzxLRYCAyJnlG7DtFaQIc,5243
 hiddifypanel/panel/admin/QuickSetup.py,sha256=EDa_ombxF3vWDsj7JEmDnw8Kf0bKwdXU-IdISDi2hj0,11448
@@ -822,24 +822,24 @@ hiddifypanel/templates/redirect.html,sha256=K9x_O4P96vEkqBhOXIhoGrWw1KIqd2bL0BjI
 hiddifypanel/templates/static.html,sha256=jp6q4wtx-k2A_cjqJoNiMS7Ee30arE45qI3ev4d5ky4,165
 hiddifypanel/templates/hiddify-flask-admin/actions.html,sha256=2NeITe2e-lPKCk_o511tCIqVtrPu8LYHE1wTCtrFUrI,1331
 hiddifypanel/templates/hiddify-flask-admin/list.html,sha256=MBGrTqZpzNLe4sZy0RozvXNr8seFUQc2C6v88BJtNWc,11095
-hiddifypanel/translations/en/LC_MESSAGES/messages.mo,sha256=xKjzGhSJO71URpFNxD0DBW0BPXJLUPl-BYa7zrIjrmI,75756
+hiddifypanel/translations/en/LC_MESSAGES/messages.mo,sha256=e9AeCdZiPyTQda9JMtIiduUN6TgpZegk00z68TViM7M,75756
 hiddifypanel/translations/en/LC_MESSAGES/messages.po,sha256=96O8XWX3UEb8OCw0WL9cGTOkzyU51UupXSKt4dBMs14,78920
-hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=oA9Ptn17rDCOuGi24lY3_MIUVr2fYYhHOYkMkcWbr2I,96092
+hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=vXqVel33I-fbHfqMVNYUpGuQqAfvYcOveiD-pxhWgEg,96092
 hiddifypanel/translations/fa/LC_MESSAGES/messages.po,sha256=JdZQhrLwzFDngs0Wu3qDJaCxSoh7UJn09zwPTMKupyg,101469
-hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=4qHrNodkt-6_zgGyRV3kuTeUc8FDwQmQCF9myyJdNoM,58649
+hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=9lwP8lZn_1Z2sAH6hLIisVo1nEMPhVKStnaGChs33Sg,58649
 hiddifypanel/translations/pt/LC_MESSAGES/messages.po,sha256=tEWo_g0gJAm1wlmRWfV7rKjt1w87GglPwv504K7hPyI,69401
-hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=49qGdceJuJmi4yKqXIdyfeogPP46YDF6kkj8r6sue1Y,97620
+hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=3oNnqBSpFxgabcQ0KDf13IH_Z37OdoQ9Dp3bc04lFuM,97620
 hiddifypanel/translations/ru/LC_MESSAGES/messages.po,sha256=7gdyumMtKwmL2KtbdE6aVSZ31N5VM51GuyHhS__41ds,104624
-hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=JJrIIN5TceGYRpwEVXI1uB-cFWUGm4Ni28SCm2QDzWU,58966
+hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=U-A6kyh-rjI0aF4Wy4suskc4bdsIYmUvWXtMhoPgW9Q,58966
 hiddifypanel/translations/zh/LC_MESSAGES/messages.po,sha256=8aP7TqaDZjDEHwiL0t8_eu5yP5PH8OrgouOND9ExH88,68629
 hiddifypanel/translations.i18n/en.json,sha256=IukyU5kkY_FRkFx_xT1APP7A5PASazjFOzMzDg5aZy0,68563
 hiddifypanel/translations.i18n/fa.json,sha256=ebTs9S5L4F_rFYfQxuJ8pMr6fz2PG8i8fkl4Soyxhzc,91103
 hiddifypanel/translations.i18n/pt.json,sha256=YQseQvgHDlCy3HHVJo-yAvepMl_y-zCU0qPLARybDmA,59407
 hiddifypanel/translations.i18n/ru.json,sha256=dCp5BI_15WoiMpV2u9_6M6feS_yL_lf22gXeyMqJDB4,94231
 hiddifypanel/translations.i18n/zh.json,sha256=8iFoOhmXeoPJHWop7Fa8FMs1Ix-5jvn09gq8N9w1iUs,58875
-hiddifypanel-10.50.2.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
-hiddifypanel-10.50.2.dist-info/METADATA,sha256=PjgN7NVbTyxamXLihAR41ABhBBQxahWSY5pY8Q7h6pk,4039
-hiddifypanel-10.50.2.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-hiddifypanel-10.50.2.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
-hiddifypanel-10.50.2.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
-hiddifypanel-10.50.2.dist-info/RECORD,,
+hiddifypanel-10.50.4.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
+hiddifypanel-10.50.4.dist-info/METADATA,sha256=XYt1i87iZnTYfGMtYFAgRN52SGYx0xWPJnD1t4seg1I,4039
+hiddifypanel-10.50.4.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+hiddifypanel-10.50.4.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
+hiddifypanel-10.50.4.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
+hiddifypanel-10.50.4.dist-info/RECORD,,