nginx-lens 0.3.0__tar.gz → 0.3.1__tar.gz

{nginx_lens-0.3.0/nginx_lens.egg-info → nginx_lens-0.3.1}/PKG-INFO

@@ -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 → nginx_lens-0.3.1}/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:

{nginx_lens-0.3.0 → nginx_lens-0.3.1}/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 → nginx_lens-0.3.1/nginx_lens.egg-info}/PKG-INFO

@@ -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 → nginx_lens-0.3.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="nginx-lens",
-    version="0.3.0",
+    version="0.3.1",
     description="CLI-инструмент для анализа, визуализации и диагностики конфигураций Nginx",
     author="Daniil Astrouski",
     author_email="shelovesuastra@gmail.com",

{nginx_lens-0.3.0 → nginx_lens-0.3.1}/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": []},
             ...
         ]
     }