hiddifypanel 10.85.0b11__py3-none-any.whl → 10.85.0b13__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-10.85.0b11
+10.85.0b13

hiddifypanel/VERSION.py

@@ -1,6 +1,6 @@
 # import importlib.metadata
 from datetime import datetime
 
-__version__ = '10.85.0b11'
-__release_time__= datetime.strptime('2025-04-18T21:41:39','%Y-%m-%dT%H:%M:%S')
+__version__ = '10.85.0b13'
+__release_time__= datetime.strptime('2025-04-29T02:17:22','%Y-%m-%dT%H:%M:%S')
 is_released_version=True

hiddifypanel/hutils/network/net.py

@@ -4,7 +4,6 @@ from urllib.parse import urlparse
 import urllib.request
 import ipaddress
 from hiddifypanel.hutils.network.auto_ip_selector import IPASN
-import netifaces
 import requests
 import random
 import socket
@@ -12,7 +11,10 @@ import time
 import ssl
 import re
 import os
-
+import ipaddress
+import psutil
+import socket
+from typing import List, Union, Literal
 
 from hiddifypanel.models import *
 from hiddifypanel.cache import cache
@@ -87,30 +89,32 @@ def get_socket_public_ip(version: Literal[4, 6]) -> Union[ipaddress.IPv4Address,
         return None
 
 
+
 def get_interface_public_ip(version: Literal[4, 6]) -> List[Union[ipaddress.IPv4Address, ipaddress.IPv6Address]]:
     addresses = []
     try:
-        interfaces = netifaces.interfaces()
-        for interface in interfaces:
-            if version == 4:
-                address_info = netifaces.ifaddresses(interface).get(netifaces.AF_INET, [])
-            elif version == 6:
-                address_info = netifaces.ifaddresses(interface).get(netifaces.AF_INET6, [])
-            else:
-                continue
-
-            if address_info:
-                for addr in address_info:
-                    address = ipaddress.ip_address(addr['addr'])
-                    if address.is_global:
-                        addresses.append(address)
+        interfaces = psutil.net_if_addrs()
+        for interface_addresses in interfaces.values():
+            for addr in interface_addresses:
+                if version == 4 and addr.family == socket.AF_INET:
+                    ip = addr.address
+                elif version == 6 and addr.family == socket.AF_INET6:
+                    ip = addr.address
+                else:
+                    continue
+
+                try:
+                    ip_obj = ipaddress.ip_address(ip.split('%')[0])  # Remove scope_id for IPv6
+                    if ip_obj.is_global:
+                        addresses.append(ip_obj)
+                except ValueError:
+                    continue
 
         return addresses
 
     except (OSError, KeyError):
         return []
 
-
 @cache.cache(ttl=600)
 def get_ips(version: Literal[4, 6] | None = None) -> List[Union[ipaddress.IPv4Address, ipaddress.IPv6Address]]:
     if not version:

{hiddifypanel-10.85.0b11.dist-info → hiddifypanel-10.85.0b13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hiddifypanel
-Version: 10.85.0b11
+Version: 10.85.0b13
 Summary: hiddifypanel multi proxy panel
 Author: hiddify
 License: 
@@ -227,7 +227,6 @@ Requires-Dist: flask-apispec==0.11.4
 Requires-Dist: flask-babel==4.0.0
 Requires-Dist: loguru==0.7.2
 Requires-Dist: maxminddb==2.6.2
-Requires-Dist: netifaces==0.11.0
 Requires-Dist: ping3==4.0.8
 Requires-Dist: psutil==6.1.0
 Requires-Dist: python-dateutil==2.9.0.post0
@@ -249,6 +248,10 @@ Requires-Dist: dynaconf<4.0.0,>=3.2.6
 Requires-Dist: json5<1.0.0,>=0.9.28
 Requires-Dist: jinja2>=3.1.6
 Requires-Dist: marshmallow<=3.26.1
+Requires-Dist: psutils>=3.3.9
+Requires-Dist: dotenv==0.9.9
+Requires-Dist: setuptools==80.0.0
+Requires-Dist: aiohttp==3.11.18
 Provides-Extra: dev
 Requires-Dist: pytest==8.3.3; extra == "dev"
 Requires-Dist: coverage==7.6.4; extra == "dev"

{hiddifypanel-10.85.0b11.dist-info → hiddifypanel-10.85.0b13.dist-info}/RECORD

@@ -1,6 +1,6 @@
 hiddifypanel/Events.py,sha256=AlnRdjVul0jP-NCT4-zoaQgowoOo-JhdQB4ytetAFKA,723
-hiddifypanel/VERSION,sha256=V5hOiMX7D-uhAmvk1nJ0ZK2X0Wb_UCwzaILWHFPvyAs,11
-hiddifypanel/VERSION.py,sha256=TRaIqSW_J_-LUdBqajOFAnzxDbSucP6FvqkZVx5-v-I,190
+hiddifypanel/VERSION,sha256=_3TIXIJLHrZ8V9SJZ1n0-vWNvORk3Z4UlYHuErqje4g,11
+hiddifypanel/VERSION.py,sha256=z0e-xGNYuyuYlv3dh3-KLOSqUXSKe1jv7G0g3Dba-Tk,190
 hiddifypanel/__init__.py,sha256=kigwDO8d9jXyPZLvJAWd6zo-GX3pG_xWf-q2aStz80Y,377
 hiddifypanel/__main__.py,sha256=IVchnXpK6bm8T3N--mN17HBQNLMeLAjyP7iwzULexB4,218
 hiddifypanel/auth.py,sha256=LJmH4ROqZv5ej_4m1b0xvbEw2meJTzDR1mFCDm523kE,8041
@@ -36,7 +36,7 @@ hiddifypanel/hutils/importer/xui.py,sha256=TtmF4KJ263k3ByUvOeVKPlsGfj0tHLdlSdUQs
 hiddifypanel/hutils/network/__init__.py,sha256=wQ1atebA98SC0agNc_Tbe4ct1aIIKaXOniSEyTE2PKo,348
 hiddifypanel/hutils/network/auto_ip_selector.py,sha256=wFme4MI32_LnNujYhg-ZfMIfjPd8fTMTd2RmBkbUW7A,5582
 hiddifypanel/hutils/network/cf_api.py,sha256=9SdVV0EMfoEozbGq0pzqLWt6h2mvM1DYKBdIxi9G-2Y,2688
-hiddifypanel/hutils/network/net.py,sha256=SKXPHeNVI7sp2VMaH-RpT0-ckxpRJwZrfe6bFiemqVY,12384
+hiddifypanel/hutils/network/net.py,sha256=1E1nnMQnJJu2OlDvpsPoRkKSRSAqGOxDa_xGsxfz_sM,12535
 hiddifypanel/hutils/node/__init__.py,sha256=p9-nse5h2p3SX6XdU33GOqOX-8OfvmdkDRmIq3cWDWM,63
 hiddifypanel/hutils/node/api_client.py,sha256=Gr2532czQEE3YBh3sbeK036QI5gXDigUFlrMdJuO2sE,3684
 hiddifypanel/hutils/node/child.py,sha256=oAyKlEHHn9FHcpZ9jBi3nYH-GHs8H7Gi2hzkmtO5IA8,6714
@@ -842,17 +842,17 @@ 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=cBQIYGzYgsQBRoT-74-vW71ysHvuECbuUo2r2czTWdY,80248
+hiddifypanel/translations/en/LC_MESSAGES/messages.mo,sha256=nsfV5rm9vFjbMCbZwmLVpkUKbzMh3_DNpFFr-38LBZc,80248
 hiddifypanel/translations/en/LC_MESSAGES/messages.po,sha256=ZQn1-QHu0FwpHIluExU9U1p738DrpK_vBaucF1ndyvo,83564
-hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=Np947t6zwnP8qSyc6hsGl5kT7DhgAn3mV0ikZ0zU4Cs,102665
+hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=eKj33549JHwVKae5MNzI-0566AskqEbZKHtRYGLlmq8,102665
 hiddifypanel/translations/fa/LC_MESSAGES/messages.po,sha256=xEU_jSeWnc70mvoPJ7f0d_9lG5U-mvo3BQzcRRvB4o8,107420
-hiddifypanel/translations/my/LC_MESSAGES/messages.mo,sha256=69DQSUGkaW-9tSgyvHNUVnGFof0HsQQhLwK9dMCNFCo,139090
+hiddifypanel/translations/my/LC_MESSAGES/messages.mo,sha256=9YoVz5lUxjy1eG3L7iT6jbBp2b3As-UcmpsFqkyDlXE,139090
 hiddifypanel/translations/my/LC_MESSAGES/messages.po,sha256=GcrOHDJC2wjo1L8lLmwLOs_dwoqcf0f6rXXjDv8JnsE,141985
-hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=s_KKmA26HVmsB6qJIcHDLGCDfniyf9DZ__XS_foPzGw,80797
+hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=uFzpowvJ0Op74ymYYvRpZZE0A9LALysxf7QNPQu6kzU,80797
 hiddifypanel/translations/pt/LC_MESSAGES/messages.po,sha256=pX1dG9wcQEYRBpxU3mL-gY_q2YNkVwbRmrI6wNHjkm8,85364
-hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=85ZcJyBWVKPk2u--UJtbEqQVeOf5oxyOA5t0Xaf1c6k,108594
+hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=Qk6I-jwZS81Kb6opRMNvMh0aRdxKBVD7RRKWgiB2OaU,108594
 hiddifypanel/translations/ru/LC_MESSAGES/messages.po,sha256=mc8TFxwLUu8iBH8iK-aGUpQoKDRCjb2sh6fZK1w1inU,113367
-hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=X3lqgn-O1ZZJ89lwpvYLQhijeD-iVWTW40SBJdm0oRU,75296
+hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=VKy42xuRYhOV-y3cRjlhomCs4fnSkrmxlzUkKK7lsW0,75296
 hiddifypanel/translations/zh/LC_MESSAGES/messages.po,sha256=ze5ipeKdB4ISOMkT0ERufBPdlWDT5m3xUj0OSeBdkpk,79474
 hiddifypanel/translations.i18n/en.json,sha256=4rDoVjPSUqs8OCh8dHf923wjHmgJNguelTN3b1EwLqA,72605
 hiddifypanel/translations.i18n/fa.json,sha256=3WMq36rLV-1E9GTVTovDlEPIoOJ5cedOBDdke-OcyXE,96515
@@ -861,9 +861,9 @@ hiddifypanel/translations.i18n/my.json,sha256=QAXg__5TCqfx3Ck0cw5YQsSXX_3kqUhMOd
 hiddifypanel/translations.i18n/pt.json,sha256=bO1-qEZJ9yf6Pz_6Vz18xDLezp3pCYwK8_aTLMJA1Iw,74570
 hiddifypanel/translations.i18n/ru.json,sha256=kCI1TBgj1T0VnvRfrgxCnLt_fA6ZuD9kjRt0vkmyvb0,102357
 hiddifypanel/translations.i18n/zh.json,sha256=A50l-_uQ4lsZwcF3UyGcyZxsR3hAjmvnMrJLnTcVZbI,69103
-hiddifypanel-10.85.0b11.dist-info/licenses/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
-hiddifypanel-10.85.0b11.dist-info/METADATA,sha256=CrAp0-QNuYW694M_AGAdtxwhSybestEYl4Hc2an_rgQ,25536
-hiddifypanel-10.85.0b11.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-hiddifypanel-10.85.0b11.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
-hiddifypanel-10.85.0b11.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
-hiddifypanel-10.85.0b11.dist-info/RECORD,,
+hiddifypanel-10.85.0b13.dist-info/licenses/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
+hiddifypanel-10.85.0b13.dist-info/METADATA,sha256=jfUVN6D71ZpKY9pvoh6DaDwXAZaiq0__cO7ijko90XQ,25628
+hiddifypanel-10.85.0b13.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+hiddifypanel-10.85.0b13.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
+hiddifypanel-10.85.0b13.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
+hiddifypanel-10.85.0b13.dist-info/RECORD,,

{hiddifypanel-10.85.0b11.dist-info → hiddifypanel-10.85.0b13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any