nginx-lens 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

commands/health.py

@@ -51,15 +51,17 @@ def health(
             color = "green" if srv["healthy"] else "red"
             
             if resolve:
-                resolved = None
+                resolved_list = []
                 if name in resolved_info:
                     for resolved_srv in resolved_info[name]:
                         if resolved_srv["address"] == srv["address"]:
-                            resolved = resolved_srv["resolved"]
+                            resolved_list = resolved_srv["resolved"]
                             break
                 
-                if resolved:
-                    table.add_row(srv["address"], f"[{color}]{status}[/{color}]", resolved)
+                if resolved_list:
+                    # Показываем все IP-адреса через запятую
+                    resolved_str = ", ".join(resolved_list)
+                    table.add_row(srv["address"], f"[{color}]{status}[/{color}]", f"[green]{resolved_str}[/green]")
                 else:
                     table.add_row(srv["address"], f"[{color}]{status}[/{color}]", "[yellow]Failed to resolve[/yellow]")
             else:

commands/resolve.py

@@ -40,8 +40,11 @@ def resolve(
     for name, servers in results.items():
         for idx, srv in enumerate(servers):
             upstream_name = name if idx == 0 else ""
-            if srv["resolved"]:
-                table.add_row(upstream_name, srv["address"], f"[green]{srv['resolved']}[/green]")
+            resolved_list = srv["resolved"]
+            if resolved_list:
+                # Показываем все IP-адреса через запятую
+                resolved_str = ", ".join(resolved_list)
+                table.add_row(upstream_name, srv["address"], f"[green]{resolved_str}[/green]")
             else:
                 table.add_row(upstream_name, srv["address"], "[red]Failed to resolve[/red]")
 

{nginx_lens-0.3.0.dist-info → nginx_lens-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nginx-lens
-Version: 0.3.0
+Version: 0.3.1
 Summary: CLI-инструмент для анализа, визуализации и диагностики конфигураций Nginx
 Author: Daniil Astrouski
 Author-email: shelovesuastra@gmail.com

{nginx_lens-0.3.0.dist-info → nginx_lens-0.3.1.dist-info}/RECORD

@@ -15,10 +15,10 @@ commands/analyze.py,sha256=W6begSgXNjgKJGoGeguR3WKgHPLkClWXxxpDcqvsJdc,8343
 commands/cli.py,sha256=brzp6xDDWIrm7ibaoT4x94hgAdBB2DVWniXoK8dRylE,782
 commands/diff.py,sha256=C7gRIWh6DNWHzjiQBPVTn-rZ40m2KCY75Zd6Q4URJIE,2076
 commands/graph.py,sha256=xB6KjXBkLmm5gII3e-5BMRGO7WeTwc7EFxRGzYgnme4,5947
-commands/health.py,sha256=Q_eDWrDin-wYzxCCDDfVkQd5VzFjUC0e9I7opGyaSqw,2897
+commands/health.py,sha256=ZGc42Ak4xoZt9r9DJ_84AvgQ8yXCO-CzWppvsOww1Yo,3086
 commands/include.py,sha256=5PTYG5C00-AlWfIgpQXLq9E7C9yTFSv7HrZkM5ogDps,2224
 commands/logs.py,sha256=RkPUdIpbO9dOVL56lemreYRuAjMjcqqMxRCKOFv2gC4,3691
-commands/resolve.py,sha256=u55MmHRNLIWJpQcPjSOjxtOvsv3Nf0rOQwkh122xyvM,1658
+commands/resolve.py,sha256=hdbvB88bgivNt1v5LMyhf--2mwfI_IUXyi4b1IUB62A,1841
 commands/route.py,sha256=-x_71u6ENl3iO-oxK3bdE8v5eZKf4xRCydeUyXMFVrY,3163
 commands/syntax.py,sha256=ZWFdaL8LVv9S694wlk2aV3HJKb0OSKjw3wNgTlNvFR8,3418
 commands/tree.py,sha256=mDfx0Aeg1EDQSYQoJ2nJIkSd_uP7ZR7pEqy7Cw3clQ0,2161
@@ -26,13 +26,13 @@ exporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 exporter/graph.py,sha256=WYUrqUgCaK6KihgxAcRHaQn4oMo6b7ybC8yb_36ZIsA,3995
 exporter/html.py,sha256=uquEM-WvBt2aV9GshgaI3UVhYd8sD0QQ-OmuNtvYUdU,798
 exporter/markdown.py,sha256=_0mXQIhurGEZ0dO-eq9DbsuKNrgEDIblgtL3DAgYNo8,724
-nginx_lens-0.3.0.dist-info/licenses/LICENSE,sha256=g8QXKdvZZC56rU8E12vIeYF6R4jeTWOsblOnYAda3K4,1073
+nginx_lens-0.3.1.dist-info/licenses/LICENSE,sha256=g8QXKdvZZC56rU8E12vIeYF6R4jeTWOsblOnYAda3K4,1073
 parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 parser/nginx_parser.py,sha256=Sa9FtGAkvTqNzoehBvgLUWPJHLLIZYWH9ugSHW50X8s,3699
 upstream_checker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-upstream_checker/checker.py,sha256=816yjsYlsyjs3B5Xmj7yjU1d-2xesTnMxhCR9WX4tsU,4409
-nginx_lens-0.3.0.dist-info/METADATA,sha256=vZFN0kAKjwFK9LBeX0U6MjPXtx7l-e7E7CJIEXn_tE0,520
-nginx_lens-0.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nginx_lens-0.3.0.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
-nginx_lens-0.3.0.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
-nginx_lens-0.3.0.dist-info/RECORD,,
+upstream_checker/checker.py,sha256=Th49U6OF-egTH145XOyrfIUUHtygBJiOtqqD9ZT1lKo,5261
+nginx_lens-0.3.1.dist-info/METADATA,sha256=Z-8Ke06GaHt1iVb4zvhX5G3RiJMHwW7bdHRuwKi9Wd8,520
+nginx_lens-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nginx_lens-0.3.1.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
+nginx_lens-0.3.1.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
+nginx_lens-0.3.1.dist-info/RECORD,,

upstream_checker/checker.py

@@ -3,7 +3,7 @@
 import socket
 import time
 import http.client
-from typing import Dict, List, Optional
+from typing import Dict, List
 
 
 def check_tcp(address: str, timeout: float, retries: int) -> bool:
@@ -49,48 +49,61 @@ def check_http(address: str, timeout: float, retries: int) -> bool:
     return False
 
 
-def resolve_address(address: str) -> Optional[str]:
+def resolve_address(address: str) -> List[str]:
     """
-    Резолвит адрес upstream сервера в IP-адрес.
+    Резолвит адрес upstream сервера в IP-адреса.
     
     Args:
         address: Адрес в формате "host:port" или "host:port параметры"
         
     Returns:
-        IP-адрес в формате "ip:port" или None, если резолвинг не удался
+        Список IP-адресов в формате "ip:port" или пустой список, если резолвинг не удался
     """
     try:
         host_port = address.split()[0]
         
         if ":" not in host_port:
-            return None
+            return []
             
         parts = host_port.rsplit(":", 1)
         if len(parts) != 2:
-            return None
+            return []
         host, port = parts
         
+        # Если это уже IPv4 адрес, возвращаем как есть
         try:
             socket.inet_aton(host)
-            return host_port
+            return [host_port]
         except socket.error:
             pass
         
+        # Проверяем IPv6 (в квадратных скобках)
         if host.startswith("[") and host.endswith("]"):
             ipv6_host = host[1:-1]
             try:
                 socket.inet_pton(socket.AF_INET6, ipv6_host)
-                return host_port
+                return [host_port]
             except (socket.error, OSError):
                 pass
         
+        # Пытаемся резолвить DNS имя - получаем все IP-адреса
         try:
-            ip = socket.gethostbyname(host)
-            return f"{ip}:{port}"
+            # gethostbyname_ex возвращает (hostname, aliaslist, ipaddrlist)
+            _, _, ipaddrlist = socket.gethostbyname_ex(host)
+            # Фильтруем только IPv4 адреса (IPv6 обрабатываются отдельно)
+            resolved_ips = []
+            for ip in ipaddrlist:
+                try:
+                    # Проверяем, что это IPv4
+                    socket.inet_aton(ip)
+                    resolved_ips.append(f"{ip}:{port}")
+                except socket.error:
+                    pass
+            return resolved_ips if resolved_ips else []
         except (socket.gaierror, OSError):
-            return None
+            return []
     except (ValueError, IndexError, AttributeError):
-        return None
+        return []
 
 
 def resolve_upstreams(
@@ -102,9 +115,9 @@ def resolve_upstreams(
     Возвращает:
     {
         "backend": [
-            {"address": "example.com:8080", "resolved": "192.168.1.1:8080"},
-            {"address": "127.0.0.1:8080", "resolved": "127.0.0.1:8080"},
-            {"address": "badhost:80", "resolved": None},
+            {"address": "example.com:8080", "resolved": ["192.168.1.1:8080", "192.168.1.2:8080"]},
+            {"address": "127.0.0.1:8080", "resolved": ["127.0.0.1:8080"]},
+            {"address": "badhost:80", "resolved": []},
             ...
         ]
     }