unitlab 2.3.15__tar.gz → 2.3.17__tar.gz

{unitlab-2.3.15/src/unitlab.egg-info → unitlab-2.3.17}/PKG-INFO

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

{unitlab-2.3.15 → unitlab-2.3.17}/setup.py

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

{unitlab-2.3.15 → unitlab-2.3.17}/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:
@@ -231,9 +231,12 @@ class CloudflareAPITunnel:
                 # Create new tunnel
                 print(f"📦 Creating new tunnel: {tunnel_name}")
                 create_url = f"{self.api_base}/accounts/{self.account_id}/tunnels"
+                # Generate secret first
+                tunnel_secret = os.urandom(32).hex()
+                
                 create_data = {
                     "name": tunnel_name,
-                    "tunnel_secret": os.urandom(32).hex()  # Generate random secret
+                    "tunnel_secret": tunnel_secret
                 }
                 
                 create_response = requests.post(create_url, headers=self.headers, json=create_data)
@@ -242,6 +245,9 @@ class CloudflareAPITunnel:
                     existing_tunnel = create_response.json()['result']
                     print(f"✅ Created tunnel: {tunnel_name}")
                     
+                    # Add the secret to the tunnel info (API doesn't return it)
+                    existing_tunnel['tunnel_secret'] = tunnel_secret
+                    
                     # Save credentials for this tunnel
                     self._save_tunnel_credentials(existing_tunnel)
                     
@@ -254,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
@@ -308,19 +319,32 @@ class CloudflareAPITunnel:
     def _save_tunnel_credentials(self, tunnel_info):
         """
         Save tunnel credentials locally for this device
+        Credentials must be base64 encoded for cloudflared
         """
+        import base64
+        import json
+        
         creds_dir = Path.home() / '.cloudflared'
         creds_dir.mkdir(exist_ok=True)
         
         creds_file = creds_dir / f"{tunnel_info['id']}.json"
         
+        # Get the secret - it should be hex string
+        secret_hex = tunnel_info.get('tunnel_secret') or tunnel_info.get('secret')
+        if secret_hex:
+            # Convert hex to bytes then to base64
+            secret_bytes = bytes.fromhex(secret_hex)
+            secret_b64 = base64.b64encode(secret_bytes).decode('ascii')
+        else:
+            print("⚠️  No tunnel secret found")
+            return None
+        
         credentials = {
             "AccountTag": self.account_id,
-            "TunnelSecret": tunnel_info.get('tunnel_secret') or tunnel_info.get('secret'),
+            "TunnelSecret": secret_b64,  # Must be base64!
             "TunnelID": tunnel_info['id']
         }
         
-        import json
         with open(creds_file, 'w') as f:
             json.dump(credentials, f)
         
@@ -334,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:
@@ -347,6 +366,12 @@ 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()
+            
             if not device_tunnel:
                 print("❌ Could not create/find device tunnel")
                 # Fallback to shared tunnel if API fails
@@ -368,34 +393,51 @@ 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, using tunnel token...")
                         # Get token for this tunnel
                         token_url = f"{self.api_base}/accounts/{self.account_id}/tunnels/{tunnel_id}/token"
                         token_response = requests.get(token_url, headers=self.headers)
                         if token_response.status_code == 200:
                             token = token_response.json()['result']
-                            # Use token directly
-                            cmd = [
-                                cloudflared_path,
-                                "tunnel",
-                                "--no-autoupdate", 
-                                "run",
-                                "--token",
-                                token
-                            ]
+                            
+                            # 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
                 
-                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.15 → unitlab-2.3.17/src/unitlab.egg-info}/PKG-INFO

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