unitlab 2.3.16__tar.gz → 2.3.18__tar.gz

{unitlab-2.3.16/src/unitlab.egg-info → unitlab-2.3.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unitlab
-Version: 2.3.16
+Version: 2.3.18
 Home-page: https://github.com/teamunitlab/unitlab-sdk
 Author: Unitlab Inc.
 Author-email: team@unitlab.ai

{unitlab-2.3.16 → unitlab-2.3.18}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="unitlab",
-    version="2.3.16",
+    version="2.3.18",
     license="MIT",
     author="Unitlab Inc.",
     author_email="team@unitlab.ai",

{unitlab-2.3.16 → unitlab-2.3.18}/src/unitlab/cloudflare_api_tunnel.py

@@ -142,12 +142,12 @@ class CloudflareAPITunnel:
         print(f"🔧 Configuring tunnel routes...")
         
         # Get current tunnel config first
-        get_url = f"{self.api_base}/accounts/{self.account_id}/cfd_tunnel/{self.tunnel_id}/configurations"
+        get_url = f"{self.api_base}/accounts/{self.account_id}/tunnels/{self.tunnel_id}/configurations"
         
         try:
             # Get existing config
             response = requests.get(get_url, headers=self.headers)
-            current_config = response.json()
+            current_config = response.json() if response.status_code == 200 else {}
             
             # Build new ingress rules
             new_ingress = [
@@ -190,7 +190,7 @@ class CloudflareAPITunnel:
                 }
             }
             
-            put_url = f"{self.api_base}/accounts/{self.account_id}/cfd_tunnel/{self.tunnel_id}/configurations"
+            put_url = f"{self.api_base}/accounts/{self.account_id}/tunnels/{self.tunnel_id}/configurations"
             response = requests.put(put_url, headers=self.headers, json=config_data)
             
             if response.status_code == 200:
@@ -206,7 +206,7 @@ class CloudflareAPITunnel:
             print("   Assuming routes are configured in dashboard.")
             return True
 
-    def create_device_tunnel(self):
+    def create_device_tunnel(self, retry_on_fail=True):
         """
         Create a unique tunnel for this device if it doesn't exist
         """
@@ -260,8 +260,13 @@ class CloudflareAPITunnel:
                     print(f"❌ Failed to create tunnel: {create_response.text}")
                     return None
             else:
-                # Tunnel exists - update config file in case settings changed
-                print(f"♻️  Updating configuration for existing tunnel")
+                # Tunnel exists - but we need to ensure it can be used
+                print(f"♻️  Found existing tunnel, setting up for use")
+                
+                # Store tunnel info for later use
+                existing_tunnel['needs_token'] = True  # Mark that we'll need to use token
+                
+                # Configure tunnel routes (creates config file)
                 self._configure_tunnel_routes(existing_tunnel['id'])
                 
                 # Ensure DNS records exist
@@ -353,11 +358,6 @@ class CloudflareAPITunnel:
         try:
             print("🚀 Starting Cloudflare tunnel...")
             
-            # First, try to set up DNS and routes via API
-            if self.api_token:
-                self.create_dns_records()
-                self.update_tunnel_config()
-            
             # Ensure cloudflared is available
             cloudflared_path = self._ensure_cloudflared()
             if not cloudflared_path:
@@ -366,11 +366,33 @@ class CloudflareAPITunnel:
             # Create or get existing tunnel for this device
             device_tunnel = self.create_device_tunnel()
             
+            # Now set up DNS and routes via API after tunnel is created/found
+            if self.api_token and device_tunnel:
+                self.tunnel_id = device_tunnel['id']  # Ensure tunnel_id is set
+                self.create_dns_records()
+                self.update_tunnel_config()
+            
+            # Check if we need to recreate the tunnel
+            if device_tunnel and device_tunnel.get('needs_recreation'):
+                print("🔄 Recreating tunnel due to access issues...")
+                # Delete the old tunnel
+                tunnel_id = device_tunnel['id']
+                delete_url = f"{self.api_base}/accounts/{self.account_id}/tunnels/{tunnel_id}"
+                delete_response = requests.delete(delete_url, headers=self.headers)
+                if delete_response.status_code in [200, 204, 404]:
+                    print(f"   ✅ Deleted old tunnel")
+                    # Try creating a new one with a timestamp suffix
+                    import time
+                    self.clean_device_id = f"{self.device_id.replace(' ', '').replace('-', '').replace('.', '').replace('_', '')[:24]}-{int(time.time())}"
+                    device_tunnel = self.create_device_tunnel(retry_on_fail=False)
+                    if device_tunnel:
+                        print(f"   ✅ Created new tunnel")
+            
             if not device_tunnel:
                 print("❌ Could not create/find device tunnel")
                 # Fallback to shared tunnel if API fails
                 print("⚠️  Falling back to shared tunnel...")
-                service_token = "eyJhIjoiYzkxMTkyYWUyMGE1ZDQzZjY1ZTA4NzU1MGQ4ZGM4OWIiLCJ0IjoiMDc3N2ZjMTAtNDljNC00NzJkLTg2NjEtZjYwZDgwZDYxODRkIiwicyI6Ik9XRTNaak5tTVdVdE1tWTRaUzAwTmpoakLTazBaalF0WXpjek1tSm1ZVGt4WlRRMCJ9"
+                service_token = "eyJhIjoiYzkxMTkyYWUyMGE1ZDQzZjY1ZTA4NzU1MGQ4ZGM4OWIiLCJ0IjoiMDc3N2ZjMTAtNDljNC00NzJkLTg2NjEtZjYwZDgwZDYxODRkIiwicyI6Ik9XRTNaak5tTVdVdE1tWTRaUzAwTmpoakLTazBmalF0WXpjek1tSm1ZVGt4WlRRMCJ9"
                 cmd = [
                     cloudflared_path,
                     "tunnel",
@@ -387,34 +409,73 @@ class CloudflareAPITunnel:
                 
                 # Check if credentials file exists
                 creds_file = Path.home() / '.cloudflared' / f"{tunnel_id}.json"
+                config_file = Path.home() / '.cloudflared' / f'config-{tunnel_id}.yml'
+                cmd = None  # Initialize cmd
                 
-                if not creds_file.exists():
+                if not creds_file.exists() or device_tunnel.get('needs_token'):
                     # Try to recreate credentials from stored secret
                     if device_tunnel.get('tunnel_secret'):
                         self._save_tunnel_credentials(device_tunnel)
+                        # Continue to use credentials below
                     else:
-                        print("⚠️  No credentials found, requesting from API...")
+                        print("⚠️  No stored credentials, requesting tunnel token...")
                         # Get token for this tunnel
                         token_url = f"{self.api_base}/accounts/{self.account_id}/tunnels/{tunnel_id}/token"
+                        print(f"   Token URL: {token_url}")
+                        
                         token_response = requests.get(token_url, headers=self.headers)
+                        print(f"   Token response status: {token_response.status_code}")
+                        
                         if token_response.status_code == 200:
-                            token = token_response.json()['result']
-                            # Use token directly
-                            cmd = [
-                                cloudflared_path,
-                                "tunnel",
-                                "--no-autoupdate", 
-                                "run",
-                                "--token",
-                                token
-                            ]
+                            result = token_response.json()
+                            if 'result' in result:
+                                token = result['result']
+                                print(f"   ✅ Got tunnel token")
+                            else:
+                                print(f"   ❌ No token in response: {result}")
+                                return None
+                            
+                            # Check if config file exists with ingress rules
+                            if config_file.exists():
+                                # Use token with config file for ingress rules
+                                print(f"   Using token with config file: {config_file}")
+                                cmd = [
+                                    cloudflared_path,
+                                    "tunnel",
+                                    "--no-autoupdate",
+                                    "--config", str(config_file),
+                                    "run",
+                                    "--token", token
+                                ]
+                            else:
+                                # Use token directly
+                                print(f"   Using token directly (no config file)")
+                                cmd = [
+                                    cloudflared_path,
+                                    "tunnel",
+                                    "--no-autoupdate", 
+                                    "run",
+                                    "--token", token
+                                ]
                         else:
-                            print("❌ Could not get tunnel token")
-                            return None
+                            print(f"❌ Could not get tunnel token: {token_response.status_code}")
+                            if token_response.text:
+                                print(f"   Error: {token_response.text}")
+                            
+                            # If 404, tunnel doesn't exist or we don't have access
+                            if token_response.status_code == 404:
+                                print(f"🔄 Tunnel not accessible (404), will try to recreate...")
+                                # Mark for recreation
+                                device_tunnel['needs_recreation'] = True
+                                return None
+                            else:
+                                print(f"   ℹ️  Token endpoint returned {token_response.status_code}")
+                                print(f"   This might mean the tunnel needs to be recreated manually")
+                                return None
                 
-                if creds_file.exists():
+                # Only use credentials if we haven't already set cmd with token
+                if cmd is None and creds_file.exists():
                     # Check if config file exists
-                    config_file = Path.home() / '.cloudflared' / f'config-{tunnel_id}.yml'
                     if config_file.exists():
                         # Run tunnel with config file (includes routes)
                         cmd = [

{unitlab-2.3.16 → unitlab-2.3.18/src/unitlab.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unitlab
-Version: 2.3.16
+Version: 2.3.18
 Home-page: https://github.com/teamunitlab/unitlab-sdk
 Author: Unitlab Inc.
 Author-email: team@unitlab.ai