hiddifypanel 10.15.0.dev5__py3-none-any.whl → 10.16.0.dev1__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-10.15.0.dev5
+10.16.0.dev1

hiddifypanel/VERSION.py

@@ -1,3 +1,3 @@
-__version__='10.15.0.dev5'
+__version__='10.16.0.dev1'
 from datetime import datetime
 __release_date__= datetime.strptime('2024-04-07','%Y-%m-%d')

hiddifypanel/drivers/xray_api.py

@@ -13,22 +13,32 @@ class XrayApi(DriverABS):
 
     def get_enabled_users(self):
         xray_client = self.get_xray_client()
-        users = User.query.all()
-        t = "xtls"
-        protocol = "vless"
-        enabled = {}
-        for u in users:
-            uuid = u.uuid
-            try:
-                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')
-                enabled[uuid] = 0
-            except xtlsapi.xtlsapi.exceptions.EmailAlreadyExists as e:
-                enabled[uuid] = 1
-            except Exception as e:
-                print(f"error {e}")
-                enabled[uuid] = e
-        return enabled
+        usages = xray_client.stats_query('user', reset=True)
+        res = defaultdict(int)
+        for use in usages:
+            if "user>>>" not in use.name:
+                continue
+            uuid = use.name.split(">>>")[1].split("@")[0]
+            res[uuid] = 1
+        return res
+
+        # xray_client = self.get_xray_client()
+        # users = User.query.all()
+        # t = "xtls"
+        # protocol = "vless"
+        # enabled = {}
+        # for u in users:
+        #     uuid = u.uuid
+        #     try:
+        #         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')
+        #         enabled[uuid] = 0
+        #     except xtlsapi.xtlsapi.exceptions.EmailAlreadyExists as e:
+        #         enabled[uuid] = 1
+        #     except Exception as e:
+        #         print(f"error {e}")
+        #         enabled[uuid] = e
+        # return enabled
 
     def get_inbound_tags(self):
         try:
@@ -80,7 +90,9 @@ class XrayApi(DriverABS):
                 pass
 
     def remove_client(self, user):
-        uuid = user.uuid
+        return self._remove_client(user.uuid)
+
+    def _remove_client(self, uuid):
         xray_client = self.get_xray_client()
         tags = self.get_inbound_tags()
 
@@ -101,7 +113,10 @@ class XrayApi(DriverABS):
             if "user>>>" not in use.name:
                 continue
             uuid = use.name.split(">>>")[1].split("@")[0]
-            res[uuid_user_map[uuid]] += use.value
+            if u := uuid_user_map.get(uuid):
+                res[u] += use.value
+            else:
+                self._remove_client(uuid)
         return res
 
     def get_usage_imp(self, uuid):

{hiddifypanel-10.15.0.dev5.dist-info → hiddifypanel-10.16.0.dev1.dist-info}/METADATA

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

{hiddifypanel-10.15.0.dev5.dist-info → hiddifypanel-10.16.0.dev1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 hiddifypanel/Events.py,sha256=AlnRdjVul0jP-NCT4-zoaQgowoOo-JhdQB4ytetAFKA,723
-hiddifypanel/VERSION,sha256=mlFI8JzU61wms1NFXkSsMd6OXAJMo8DzqOVvH_s49AM,13
-hiddifypanel/VERSION.py,sha256=FwTN8JyocNuFCR5vOak6pmSdcwC8IVSL3LoFbEL2jKw,118
+hiddifypanel/VERSION,sha256=zQK0fyB6Wa8v3Jxycg8ywu0UDgb1TNEX-lyAPNUWcio,13
+hiddifypanel/VERSION.py,sha256=FghBzMr8jfwNOW_Ia-vmHdwzAbURiOsmmYeH1MfWbLw,118
 hiddifypanel/__init__.py,sha256=aLukp3ORszdcH4G9J-MlxhjHN6yFlOuOE6mm-L3aG_g,266
 hiddifypanel/__main__.py,sha256=IVchnXpK6bm8T3N--mN17HBQNLMeLAjyP7iwzULexB4,218
 hiddifypanel/auth.py,sha256=5GUwwKCRY90RS0WTKPfqzuOYuLuwGLpNLpnKmubf7DE,7405
@@ -12,7 +12,7 @@ hiddifypanel/drivers/singbox_api.py,sha256=vApQU4vwMZdd71-FEnTGm8btRLoC1l0sSzAcH
 hiddifypanel/drivers/ssh_liberty_bridge_api.py,sha256=FXoS65hydwisizC20HTJvMQR_SNx1MvZ4Fu8jSwesWw,1768
 hiddifypanel/drivers/user_driver.py,sha256=vT04mM6cFMrnqt8VLlrw5iRThPDD_dHfo8Jvn-K_eyk,1914
 hiddifypanel/drivers/wireguard_api.py,sha256=YsfEIZXxwPqjhK9QGInrDFdLNCyCEPg9b9oDRW0--RY,3286
-hiddifypanel/drivers/xray_api.py,sha256=zUAnbnOB-Wo3dfiIIQaeX58G873sNI-IqJYzSKuOt5g,4270
+hiddifypanel/drivers/xray_api.py,sha256=ZYzScPW7DNxGxQOFdG30H9wl1qOcTjkRTq5yLcgEok0,4788
 hiddifypanel/hutils/__init__.py,sha256=eHFBeXrTwiW3sb0ojTJNG_J26uiwyBoZ9O-W2lQKmeo,296
 hiddifypanel/hutils/auth.py,sha256=CoT25nrneWaAnRtx7qDE0v4WkdCeV3ra78VqEN48jeE,3031
 hiddifypanel/hutils/convert.py,sha256=bxkbphOC9GifVMKwgmo4lpAOyJ5rdSVRnG1eEjh8tIc,2061
@@ -820,24 +820,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=XXvSV1DAuLDJnfz2ZcvY2fWIaj8voP7tkSr2cHUArlw,74266
+hiddifypanel/translations/en/LC_MESSAGES/messages.mo,sha256=XtIaraDoYjCRrauW5SeXWkXuOweXeuu2qXbzypNI7_Q,74266
 hiddifypanel/translations/en/LC_MESSAGES/messages.po,sha256=htfXb1yD7U4vfsyeF9ECctKBrfJOwnaAfPp8cUiZvTE,77415
-hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=f_1m-jxIAH5ZWhwOENl4uY32w4MgE5h46x-hv4pcpCQ,94799
+hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=6ZickcaPAvCeHGPPDMWv3LtUYmcuv5VB3Vx8dyU0rsU,94799
 hiddifypanel/translations/fa/LC_MESSAGES/messages.po,sha256=kfaTzdmS1eJCb0NjrHLfltd_y-FGXI2LCQxDEannE4E,99980
-hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=xhkh2E_5aSh2VgTnunc7EMlEaubMSTr8gnraFybRp00,60612
+hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=YSpYfH-sydji9eVfEwLlsulQXBCNEbns_MLlBPnUnus,60612
 hiddifypanel/translations/pt/LC_MESSAGES/messages.po,sha256=tUp3Ed-ZBDZeD99yb7o6I76wWUU_QQT2i_cQfNV_7Zk,69869
-hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=c6s4TDY5Xc2RZZRtRKwZCjDbVunfwMIO7BTGF524dsE,95543
+hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=XfiPq_Y7GvlRwe7bM-5-iAkkmL_tR9ZchSXpKTmfovo,95543
 hiddifypanel/translations/ru/LC_MESSAGES/messages.po,sha256=ojNL5z1gvjgiO-5hjccCLhK0Z-CeZKrwE3yiEE4ekeg,102007
-hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=mu4Na-njeTRjjgA-SwzefngIPFzPMxoUy_NEGTnQMvY,60878
+hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=OXYBxI27HTCKVMw6XSf28fZMROL-C5o06OZmcItttw8,60878
 hiddifypanel/translations/zh/LC_MESSAGES/messages.po,sha256=f0fv1MW5_Okc5GixUoPv5BkV0XwM6wKrjK7khLeiv18,69040
 hiddifypanel/translations.i18n/en.json,sha256=07z5rKyF0AADkYOPjJVAN9aFrbtj4V8ZAQM5wK4f4bc,67420
 hiddifypanel/translations.i18n/fa.json,sha256=M5-D3rdRCbrWQqT3N4hw0OEmjfsBAIWOLeLmqSshyCw,89976
 hiddifypanel/translations.i18n/pt.json,sha256=Wh72C6ToJUVXgAfB_2JqJKQjw0_Rvv7gsYIp8-Nbd8Q,60171
 hiddifypanel/translations.i18n/ru.json,sha256=WNSflb5-l-CWOQ71SWhDSkgQLkJVHeZ_dehn3lRyv0s,91988
 hiddifypanel/translations.i18n/zh.json,sha256=17fERyiPhWV2899MMynfIeuZL6X7u-_pWd0h5n6FJUo,59588
-hiddifypanel-10.15.0.dev5.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
-hiddifypanel-10.15.0.dev5.dist-info/METADATA,sha256=hM82DUn9eAqmoSiovDN_xM_lZj_PB7M9C8V9zWMgxU8,4013
-hiddifypanel-10.15.0.dev5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-hiddifypanel-10.15.0.dev5.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
-hiddifypanel-10.15.0.dev5.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
-hiddifypanel-10.15.0.dev5.dist-info/RECORD,,
+hiddifypanel-10.16.0.dev1.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
+hiddifypanel-10.16.0.dev1.dist-info/METADATA,sha256=wIcZ8GywJ4XpNxSSLUQ2lbrFwjnK8s0gvGIL1TBgvmQ,4013
+hiddifypanel-10.16.0.dev1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+hiddifypanel-10.16.0.dev1.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
+hiddifypanel-10.16.0.dev1.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
+hiddifypanel-10.16.0.dev1.dist-info/RECORD,,