suxitunnel 0.1.1__tar.gz → 0.1.2__tar.gz

{suxitunnel-0.1.1 → suxitunnel-0.1.2}/.gitignore

@@ -48,3 +48,7 @@ build/
 
 # Local cloudflared downloads
 .cloudflare-tunnel/
+cloudflared
+cloudflared.exe
+
+.claude/settings.local.json

{suxitunnel-0.1.1 → suxitunnel-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: suxitunnel
-Version: 0.1.1
+Version: 0.1.2
 Summary: A simple Python library to expose local servers using Cloudflare Tunnel
 Project-URL: Homepage, https://github.com/sadwx/suxitunnel
 Project-URL: Repository, https://github.com/sadwx/suxitunnel
@@ -216,7 +216,7 @@ Your App (localhost:8000) → cloudflared → Cloudflare Edge → Internet
 
 ### Cloudflared Binary
 
-The library automatically downloads the `cloudflared` binary on first use if it's not already installed. The binary is saved to `~/.cloudflare-tunnel/`.
+The library automatically downloads the `cloudflared` binary on first use if it's not already installed. The binary is saved to the library's installation directory.
 
 Supported platforms:
 - Linux (x64, ARM64)

{suxitunnel-0.1.1 → suxitunnel-0.1.2}/README.md

@@ -193,7 +193,7 @@ Your App (localhost:8000) → cloudflared → Cloudflare Edge → Internet
 
 ### Cloudflared Binary
 
-The library automatically downloads the `cloudflared` binary on first use if it's not already installed. The binary is saved to `~/.cloudflare-tunnel/`.
+The library automatically downloads the `cloudflared` binary on first use if it's not already installed. The binary is saved to the library's installation directory.
 
 Supported platforms:
 - Linux (x64, ARM64)

{suxitunnel-0.1.1 → suxitunnel-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "suxitunnel"
-version = "0.1.1"
+version = "0.1.2"
 description = "A simple Python library to expose local servers using Cloudflare Tunnel"
 readme = "README.md"
 license = "MIT"
@@ -47,5 +47,8 @@ include = [
 [dependency-groups]
 dev = [
     "build>=1.4.0",
+    "fastapi>=0.128.0",
+    "flask>=3.1.2",
     "twine>=6.2.0",
+    "uvicorn>=0.40.0",
 ]

{suxitunnel-0.1.1 → suxitunnel-0.1.2}/suxitunnel.py

@@ -86,8 +86,20 @@ class Tunnel:
         # Start the tunnel
         self._start()
     
+    def _get_library_dir(self) -> Path:
+        """Get the directory where the library is located"""
+        return Path(__file__).parent
+
     def _find_cloudflared(self) -> Optional[str]:
         """Try to find cloudflared in common locations"""
+        system = platform.system().lower()
+        binary_name = "cloudflared.exe" if system == "windows" else "cloudflared"
+
+        # First check the library directory (where downloaded binaries are stored)
+        lib_dir_path = self._get_library_dir() / binary_name
+        if lib_dir_path.exists():
+            return str(lib_dir_path)
+
         # Check if in PATH
         try:
             result = subprocess.run(
@@ -99,29 +111,31 @@ class Tunnel:
                 return "cloudflared"
         except (FileNotFoundError, subprocess.TimeoutExpired):
             pass
-        
+
         # Check common install locations
         possible_paths = [
             "/usr/local/bin/cloudflared",
             "/usr/bin/cloudflared",
             str(Path.home() / "bin" / "cloudflared"),
             str(Path.home() / ".local" / "bin" / "cloudflared"),
+            # Legacy download location
+            str(Path.home() / ".cloudflare-tunnel" / binary_name),
         ]
-        
+
         for path in possible_paths:
             if Path(path).exists():
                 return path
-        
+
         return None
     
     def _download_cloudflared(self) -> str:
         """Download cloudflared binary for the current platform"""
         system = platform.system().lower()
         machine = platform.machine().lower()
-        
+
         # Determine download URL
         base_url = "https://github.com/cloudflare/cloudflared/releases/latest/download"
-        
+
         if system == "darwin":  # macOS
             if "arm" in machine or "aarch64" in machine:
                 filename = "cloudflared-darwin-arm64.tgz"
@@ -136,13 +150,12 @@ class Tunnel:
             filename = "cloudflared-windows-amd64.exe"
         else:
             raise TunnelError(f"Unsupported platform: {system} {machine}")
-        
+
         download_url = f"{base_url}/{filename}"
-        
-        # Download location
-        download_dir = Path.home() / ".cloudflare-tunnel"
-        download_dir.mkdir(parents=True, exist_ok=True)
-        
+
+        # Download to the library directory
+        download_dir = self._get_library_dir()
+
         if filename.endswith(".tgz"):
             archive_path = download_dir / filename
             binary_path = download_dir / "cloudflared"
@@ -150,7 +163,7 @@ class Tunnel:
             binary_path = download_dir / "cloudflared.exe"
         else:
             binary_path = download_dir / "cloudflared"
-        
+
         # Check if already downloaded
         if binary_path.exists():
             return str(binary_path)