wip

Author: ourway

.flake8

@@ -1,6 +1,6 @@
 [flake8]
 max-line-length = 79
-extend-ignore = E203, W503
+extend-ignore = E203, W503, E501
 exclude = 
     .git,
     __pycache__,

pyproject.toml

@@ -39,6 +39,7 @@ dev = [
     "pytest-asyncio>=0.21.0",
     "pytest-cov>=4.0.0",
     "black>=23.0.0",
+    "bandit>=1.8.3",
     "isort>=5.12.0",
     "flake8>=6.0.0",
     "mypy>=1.0.0",

retunnel/__init__.py

@@ -10,8 +10,6 @@
     Tunnel,
     TunnelConfig,
 )
-
-ReTunnelClient = HighPerformanceClient  # Alias for backward compatibility
 from .core.exceptions import (
     AuthenticationError,
     ConfigurationError,
@@ -20,6 +18,8 @@
     TunnelError,
 )
 
+ReTunnelClient = HighPerformanceClient  # Alias for backward compatibility
+
 __all__ = [
     "ReTunnelClient",
     "Tunnel",

retunnel/client/api_client.py

@@ -2,7 +2,6 @@
 API client for ReTunnel server interactions
 """
 
-import json
 from typing import Any, Optional
 from urllib.parse import urljoin
 
@@ -87,7 +86,7 @@ async def _request(
                 )
                 raise APIError(response.status, error_msg)
 
-            return data
+            return data  # type: ignore[no-any-return]
 
     async def register_user(
         self, email: Optional[str] = None

retunnel/client/cli.py

@@ -4,19 +4,18 @@
 
 import asyncio
 import logging
-import time
 from pathlib import Path
 from typing import Optional
 
 import typer
 import yaml
 from rich.console import Console
+from rich.live import Live
 from rich.logging import RichHandler
 from rich.panel import Panel
-from rich.table import Table
 from rich.progress import Progress, SpinnerColumn, TextColumn
 from rich.rule import Rule
-from rich.live import Live
+from rich.table import Table
 
 from .. import __version__
 from ..core.config import AuthConfig, ClientConfig
@@ -34,13 +33,14 @@
 
 def _format_bytes(num: int) -> str:
     """Format bytes to human readable format"""
-    for unit in ['B', 'KB', 'MB', 'GB', 'TB']:
-        if abs(num) < 1024.0:
-            if unit == 'B':
-                return f"{num:.0f}{unit}"
-            return f"{num:.1f}{unit}"
-        num /= 1024.0
-    return f"{num:.1f}PB"
+    size = float(num)
+    for unit in ["B", "KB", "MB", "GB", "TB"]:
+        if abs(size) < 1024.0:
+            if unit == "B":
+                return f"{size:.0f}{unit}"
+            return f"{size:.1f}{unit}"
+        size /= 1024.0
+    return f"{size:.1f}PB"
 
 
 def setup_logging(level: str = "INFO") -> None:
@@ -49,7 +49,14 @@ def setup_logging(level: str = "INFO") -> None:
         level=level,
         format="%(message)s",
         datefmt="[%X]",
-        handlers=[RichHandler(console=console, rich_tracebacks=True, show_time=False, show_path=False)],
+        handlers=[
+            RichHandler(
+                console=console,
+                rich_tracebacks=True,
+                show_time=False,
+                show_path=False,
+            )
+        ],
     )
 
 
@@ -213,14 +220,14 @@ def version() -> None:
 def credits() -> None:
     """Show open source credits."""
     console.print("\n[bold cyan]Open Source Credits[/bold cyan]\n")
-    
+
     table = Table(
         show_header=True,
         header_style="bold cyan",
         border_style="dim",
         show_edge=False,
         pad_edge=False,
-        box=None
+        box=None,
     )
     table.add_column("Package", style="cyan")
     table.add_column("License", style="green")
@@ -250,26 +257,30 @@ async def _run_tunnel(
     """Run a single tunnel."""
     # Suppress client logging to preserve Rich output
     import logging as _logging
+
     _logging.getLogger("client").setLevel(_logging.ERROR)
     _logging.getLogger("retunnel").setLevel(_logging.ERROR)
     _logging.getLogger("aiohttp").setLevel(_logging.ERROR)
     _logging.getLogger("asyncio").setLevel(_logging.ERROR)
-    
+
     # Disable the default KeyboardInterrupt traceback
     import sys
+
     sys.tracebacklimit = 0
-    
+
     # Create client (server defaults to RETUNNEL_SERVER_ENDPOINT or localhost:6400)
     client = HighPerformanceClient(server, auth_token=token)
 
     try:
         # Clean header
         console.clear()
         console.print()
-        console.print(f"[bold cyan]ReTunnel[/bold cyan] [dim]v{__version__}[/dim]")
+        console.print(
+            f"[bold cyan]ReTunnel[/bold cyan] [dim]v{__version__}[/dim]"
+        )
         console.print("[dim]Secure tunnel service[/dim]")
         console.print()
-        
+
         # Connection progress
         with Progress(
             SpinnerColumn(spinner_name="dots", style="cyan"),
@@ -279,23 +290,31 @@ async def _run_tunnel(
         ) as progress:
             task = progress.add_task("Connecting", total=None)
             await client.connect()
-            progress.update(task, description="[green]✓[/green] Connected successfully")
+            progress.update(
+                task, description="[green]✓[/green] Connected successfully"
+            )
             await asyncio.sleep(0.3)
-        
-        console.print(f"[green]✓[/green] Connected to tunnel service")
+
+        console.print("[green]✓[/green] Connected to tunnel service")
         console.print(f"[dim]Client ID: {client.client_id}[/dim]")
         console.print()
 
         # Request tunnel
         with Progress(
             SpinnerColumn(spinner_name="dots", style="cyan"),
-            TextColumn(f"[cyan]Creating {config.protocol.upper()} tunnel...[/cyan]"),
+            TextColumn(
+                "[cyan]Creating {protocol} tunnel...[/cyan]".format(
+                    protocol=config.protocol.upper()
+                )
+            ),
             console=console,
             transient=True,
         ) as progress:
             task = progress.add_task("Creating", total=None)
             tunnel = await client.request_tunnel(config)
-            progress.update(task, description="[green]✓[/green] Tunnel created")
+            progress.update(
+                task, description="[green]✓[/green] Tunnel created"
+            )
             await asyncio.sleep(0.3)
 
         # Display tunnel info cleanly
@@ -306,29 +325,29 @@ async def _run_tunnel(
         console.print()
         console.print(f"  [cyan]Protocol[/cyan]    {tunnel.protocol.upper()}")
         console.print(f"  [cyan]Local port[/cyan]  {tunnel.config.local_port}")
-        console.print(f"  [cyan]Status[/cyan]      [green]● Active[/green]")
+        console.print("  [cyan]Status[/cyan]      [green]● Active[/green]")
         console.print()
         console.print(Rule(style="dim"))
         console.print()
         console.print("[dim]Press Ctrl+C to stop[/dim]")
         console.print()
-        
+
         # Keep running and show stats using Live
         try:
             with Live(
                 "[dim]↑ 0B  ↓ 0B[/dim]",
                 console=console,
                 refresh_per_second=0.5,
-                transient=False
+                transient=False,
             ) as live:
                 while True:
                     stats = tunnel.get_stats()
-                    in_bytes = _format_bytes(stats['bytes_in'])
-                    out_bytes = _format_bytes(stats['bytes_out'])
-                    
+                    in_bytes = _format_bytes(stats["bytes_in"])
+                    out_bytes = _format_bytes(stats["bytes_out"])
+
                     # Update the live display
                     live.update(f"[dim]↑ {in_bytes}  ↓ {out_bytes}[/dim]")
-                    
+
                     await asyncio.sleep(2)
         except KeyboardInterrupt:
             pass
@@ -345,7 +364,7 @@ async def _run_tunnel(
         raise typer.Exit(1)
     finally:
         # Ensure client is closed
-        if 'client' in locals():
+        if "client" in locals():
             await client.close()
         # Give asyncio time to clean up
         await asyncio.sleep(0.1)

retunnel/client/client.py

@@ -6,7 +6,6 @@
 import logging
 import os
 import platform
-import sys
 from typing import Any, Dict, Optional, Set
 
 from pydantic import BaseModel

retunnel/client/high_performance_model.py

@@ -11,7 +11,7 @@
 from typing import Any, Dict, Optional, Set
 
 import aiohttp
-import msgpack
+import msgpack  # type: ignore[import-untyped]
 
 from ..utils.id import generate_client_id, generate_request_id
 from .api_client import APIError, ReTunnelAPIClient
@@ -55,7 +55,7 @@ class Tunnel:
     def public_url(self) -> str:
         """Get the public URL for this tunnel"""
         return self.url
-    
+
     def get_stats(self) -> Dict[str, Any]:
         """Get tunnel statistics"""
         return {
@@ -205,7 +205,9 @@ async def connect(self) -> None:
         # Create session with proper timeout and connector settings
         timeout = aiohttp.ClientTimeout(total=60)
         connector = aiohttp.TCPConnector(limit=100, limit_per_host=10)
-        self.session = aiohttp.ClientSession(timeout=timeout, connector=connector)
+        self.session = aiohttp.ClientSession(
+            timeout=timeout, connector=connector
+        )
 
         # Build WebSocket URL
         if self.server_addr.startswith(("ws://", "wss://")):
@@ -288,8 +290,9 @@ async def request_tunnel(self, config: TunnelConfig) -> Tunnel:
             if url:
                 # Replace http://localhost:6400 or http://anyhost:6400 with https://retunnel.net
                 import re
-                url = re.sub(r'http://[^/]+/', 'https://retunnel.net/', url)
-            
+
+                url = re.sub(r"http://[^/]+/", "https://retunnel.net/", url)
+
             tunnel = Tunnel(
                 id=req_id,
                 url=url,
@@ -336,7 +339,7 @@ async def _receive_message(
                     if length == len(data) - 8:
                         # It's length-prefixed, extract actual data
                         data = data[8:]
-                except:
+                except Exception:
                     # Not length-prefixed
                     pass
 
@@ -384,22 +387,26 @@ async def _handle_req_proxy(self) -> None:
         try:
             # Create new proxy WebSocket connection
             # Build WebSocket URL from server address
-            if self.server_addr.startswith(("ws://", "wss://")):
+            if self.server_addr and self.server_addr.startswith(
+                ("ws://", "wss://")
+            ):
                 # Extract the base URL and construct proxy endpoint
                 base_url = self.server_addr.replace("/api/v1/ws/tunnel", "")
                 ws_url = f"{base_url}/api/v1/ws/proxy"
             else:
                 ws_url = f"ws://{self.server_addr}/api/v1/ws/proxy"
-            
+
             # Include auth headers
             headers = {}
             if self.auth_token:
                 headers["Authorization"] = f"Bearer {self.auth_token}"
-            
+
             self.logger.debug(f"Creating proxy connection to: {ws_url}")
-            
+
             if self.session:
-                proxy_ws = await self.session.ws_connect(ws_url, headers=headers, heartbeat=30)
+                proxy_ws = await self.session.ws_connect(
+                    ws_url, headers=headers, heartbeat=30
+                )
             else:
                 raise RuntimeError("Session not initialized")
 
@@ -413,7 +420,9 @@ async def _handle_req_proxy(self) -> None:
             task.add_done_callback(self.proxy_tasks.discard)
 
         except Exception as e:
-            self.logger.warning(f"Error creating proxy connection: {e} (URL: {ws_url if 'ws_url' in locals() else 'unknown'})")
+            self.logger.warning(
+                f"Error creating proxy connection: {e} (URL: {ws_url if 'ws_url' in locals() else 'unknown'})"
+            )
 
     async def _handle_proxy_connection(
         self, proxy_ws: aiohttp.ClientWebSocketResponse
@@ -491,15 +500,15 @@ async def _handle_proxy_connection(
                                 local_writer.write(body)
                                 request_bytes += body
                             await local_writer.drain()
-                            
+
                             # Count incoming bytes
                             if tunnel:
                                 tunnel.bytes_in += len(request_bytes)
 
                             # Read response
                             response_data = b""
                             status_code = 500  # Default status code
-                            response_headers = {}
+                            response_headers: Dict[str, str] = {}
                             response_body = b""
 
                             while True:
@@ -573,10 +582,12 @@ async def _handle_proxy_connection(
                             }
 
                             await self._send_message(proxy_ws, response_msg)
-                            
+
                             # Count outgoing bytes
                             if tunnel:
-                                tunnel.bytes_out += len(response_body) + len(str(response_headers))
+                                tunnel.bytes_out += len(response_body) + len(
+                                    str(response_headers)
+                                )
 
                         except Exception as e:
                             self.logger.debug(
@@ -683,7 +694,7 @@ async def close(self) -> None:
             await self.session.close()
             # Wait for the underlying connections to close
             await asyncio.sleep(0.1)
-            
+
         # Small delay to allow aiohttp to clean up
         await asyncio.sleep(0.1)
 

retunnel/core/connection.py

@@ -4,7 +4,7 @@
 
 import asyncio
 import struct
-from typing import Any, Optional, Union
+from typing import Any, Optional
 
 import websockets