unitlab 2.3.12__py3-none-any.whl → 2.3.14__py3-none-any.whl

unitlab/cloudflare_api_tunnel.py

@@ -64,6 +64,7 @@ class CloudflareAPITunnel:
         
         self.tunnel_process = None
         self.created_dns_records = []
+        self.tunnel_config_file = None
         
         # Try to initialize binary manager, but don't fail if it doesn't work
         try:
@@ -205,6 +206,127 @@ class CloudflareAPITunnel:
             print("   Assuming routes are configured in dashboard.")
             return True
 
+    def create_device_tunnel(self):
+        """
+        Create a unique tunnel for this device if it doesn't exist
+        """
+        tunnel_name = f"device-{self.clean_device_id}"
+        print(f"🔍 Checking for tunnel: {tunnel_name}")
+        
+        # Check if tunnel already exists
+        list_url = f"{self.api_base}/accounts/{self.account_id}/tunnels"
+        response = requests.get(list_url, headers=self.headers)
+        
+        if response.status_code == 200:
+            tunnels = response.json().get('result', [])
+            existing_tunnel = None
+            
+            for tunnel in tunnels:
+                if tunnel['name'] == tunnel_name:
+                    existing_tunnel = tunnel
+                    print(f"✅ Found existing tunnel: {tunnel_name}")
+                    break
+            
+            if not existing_tunnel:
+                # Create new tunnel
+                print(f"📦 Creating new tunnel: {tunnel_name}")
+                create_url = f"{self.api_base}/accounts/{self.account_id}/tunnels"
+                create_data = {
+                    "name": tunnel_name,
+                    "tunnel_secret": os.urandom(32).hex()  # Generate random secret
+                }
+                
+                create_response = requests.post(create_url, headers=self.headers, json=create_data)
+                
+                if create_response.status_code in [200, 201]:
+                    existing_tunnel = create_response.json()['result']
+                    print(f"✅ Created tunnel: {tunnel_name}")
+                    
+                    # Save credentials for this tunnel
+                    self._save_tunnel_credentials(existing_tunnel)
+                    
+                    # Configure tunnel routes
+                    self._configure_tunnel_routes(existing_tunnel['id'])
+                    
+                    # Create DNS records for this device
+                    self.create_dns_records()
+                else:
+                    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")
+                self._configure_tunnel_routes(existing_tunnel['id'])
+                
+                # Ensure DNS records exist
+                self.create_dns_records()
+            
+            return existing_tunnel
+        
+        return None
+    
+    def _configure_tunnel_routes(self, tunnel_id):
+        """
+        Configure ingress routes for the device tunnel
+        The tunnel needs to be configured with a config file, not via API
+        So we'll create a config file for it
+        """
+        import yaml
+        
+        # Create config file for this tunnel
+        config_dir = Path.home() / '.cloudflared'
+        config_dir.mkdir(exist_ok=True)
+        config_file = config_dir / f'config-{tunnel_id}.yml'
+        
+        config = {
+            "tunnel": tunnel_id,
+            "credentials-file": str(config_dir / f"{tunnel_id}.json"),
+            "ingress": [
+                {
+                    "hostname": f"{self.jupyter_subdomain}.{self.base_domain}",
+                    "service": "http://localhost:8888",
+                    "originRequest": {
+                        "noTLSVerify": True
+                    }
+                },
+                {
+                    "hostname": f"{self.ssh_subdomain}.{self.base_domain}",
+                    "service": "ssh://localhost:22"
+                },
+                {
+                    "service": "http_status:404"
+                }
+            ]
+        }
+        
+        with open(config_file, 'w') as f:
+            yaml.dump(config, f)
+        
+        print(f"✅ Created tunnel config: {config_file}")
+        self.tunnel_config_file = config_file
+    
+    def _save_tunnel_credentials(self, tunnel_info):
+        """
+        Save tunnel credentials locally for this device
+        """
+        creds_dir = Path.home() / '.cloudflared'
+        creds_dir.mkdir(exist_ok=True)
+        
+        creds_file = creds_dir / f"{tunnel_info['id']}.json"
+        
+        credentials = {
+            "AccountTag": self.account_id,
+            "TunnelSecret": tunnel_info.get('tunnel_secret') or tunnel_info.get('secret'),
+            "TunnelID": tunnel_info['id']
+        }
+        
+        import json
+        with open(creds_file, 'w') as f:
+            json.dump(credentials, f)
+        
+        print(f"💾 Saved credentials to: {creds_file}")
+        return creds_file
+    
     def start_tunnel_with_token(self):
         """
         Start tunnel using the existing service token
@@ -222,18 +344,77 @@ class CloudflareAPITunnel:
             if not cloudflared_path:
                 raise RuntimeError("Failed to obtain cloudflared binary")
             
-            # Use service token - simple and reliable
-            # The dashboard must have *.1scan.uz -> localhost:8888 configured
-            service_token = "eyJhIjoiYzkxMTkyYWUyMGE1ZDQzZjY1ZTA4NzU1MGQ4ZGM4OWIiLCJ0IjoiMDc3N2ZjMTAtNDljNC00NzJkLTg2NjEtZjYwZDgwZDYxODRkIiwicyI6Ik9XRTNaak5tTVdVdE1tWTRaUzAwTmpoakxTazBaalF0WXpjek1tSm1ZVGt4WlRRMCJ9"
+            # Create or get existing tunnel for this device
+            device_tunnel = self.create_device_tunnel()
             
-            cmd = [
-                cloudflared_path,
-                "tunnel",
-                "--no-autoupdate",
-                "run",
-                "--token",
-                service_token
-            ]
+            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"
+                cmd = [
+                    cloudflared_path,
+                    "tunnel",
+                    "--no-autoupdate",
+                    "run",
+                    "--token",
+                    service_token
+                ]
+            else:
+                tunnel_id = device_tunnel['id']
+                tunnel_name = device_tunnel['name']
+                
+                print(f"🚇 Starting tunnel: {tunnel_name} ({tunnel_id})")
+                
+                # Check if credentials file exists
+                creds_file = Path.home() / '.cloudflared' / f"{tunnel_id}.json"
+                
+                if not creds_file.exists():
+                    # Try to recreate credentials from stored secret
+                    if device_tunnel.get('tunnel_secret'):
+                        self._save_tunnel_credentials(device_tunnel)
+                    else:
+                        print("⚠️  No credentials found, requesting from API...")
+                        # 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
+                            ]
+                        else:
+                            print("❌ Could not get tunnel token")
+                            return None
+                
+                if 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 = [
+                            cloudflared_path,
+                            "tunnel",
+                            "--no-autoupdate",
+                            "--config", str(config_file),
+                            "run"
+                        ]
+                    else:
+                        # Fallback to credentials file only
+                        cmd = [
+                            cloudflared_path,
+                            "tunnel",
+                            "--no-autoupdate",
+                            "--credentials-file", str(creds_file),
+                            "run",
+                            tunnel_id
+                        ]
             
             self.tunnel_process = subprocess.Popen(
                 cmd,
@@ -271,12 +452,17 @@ class CloudflareAPITunnel:
     def stop(self):
         """
         Stop the tunnel if running
+        Note: We keep the tunnel configuration for next run
         """
         if self.tunnel_process and self.tunnel_process.poll() is None:
             print("Stopping tunnel...")
             self.tunnel_process.terminate()
-            self.tunnel_process.wait(timeout=5)
+            try:
+                self.tunnel_process.wait(timeout=5)
+            except subprocess.TimeoutExpired:
+                self.tunnel_process.kill()
             print("Tunnel stopped")
+            print("ℹ️  Tunnel configuration preserved for next run")
 
     def _ensure_cloudflared(self):
         """

{unitlab-2.3.12.dist-info → unitlab-2.3.14.dist-info}/METADATA

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

{unitlab-2.3.12.dist-info → unitlab-2.3.14.dist-info}/RECORD

@@ -2,15 +2,15 @@ unitlab/__init__.py,sha256=Wtk5kQ_MTlxtd3mxJIn2qHVK5URrVcasMMPjD3BtrVM,214
 unitlab/__main__.py,sha256=6Hs2PV7EYc5Tid4g4OtcLXhqVHiNYTGzSBdoOnW2HXA,29
 unitlab/binary_manager.py,sha256=Q1v2Odm0hk_3g7jfDUJQfkjEbUbSjtuyo2JDUyWjDrk,5468
 unitlab/client.py,sha256=V5fTgbprmMsnMwD_FPn7oZh0KK6hdnqB4BYuY4D-JRw,24558
-unitlab/cloudflare_api_tunnel.py,sha256=d95e4c4SvjpCtnQz_aGTvP-ma9fkxsbvV-oIq3aWxIk,15533
+unitlab/cloudflare_api_tunnel.py,sha256=b3qYgI5mWuU3yiFZLNRPBk1iu27P0xq36eEqGzaeays,23309
 unitlab/exceptions.py,sha256=68Tr6LreEzjQ3Vns8HAaWdtewtkNUJOvPazbf6NSnXU,950
 unitlab/main.py,sha256=h1WG6up6STt-2fJZAkqnxenwJ7kmkqnkfq5Zs4xLSeI,5257
 unitlab/tunnel_config.py,sha256=7CiAqasfg26YQfJYXapCBQPSoqw4jIx6yR64saybLLo,8312
 unitlab/tunnel_service_token.py,sha256=ji96a4s4W2cFJrHZle0zBD85Ac_T862-gCKzBUomrxM,3125
 unitlab/utils.py,sha256=83ekAxxfXecFTg76Z62BGDybC_skKJHYoLyawCD9wGM,1920
-unitlab-2.3.12.dist-info/LICENSE.md,sha256=Gn7RRvByorAcAaM-WbyUpsgi5ED1-bKFFshbWfYYz2Y,1069
-unitlab-2.3.12.dist-info/METADATA,sha256=bMIkAY0bQjPXwYU6D1Rlrl47DoqwPZqW78OJP5NXIPA,844
-unitlab-2.3.12.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-unitlab-2.3.12.dist-info/entry_points.txt,sha256=ig-PjKEqSCj3UTdyANgEi4tsAU84DyXdaOJ02NHX4bY,45
-unitlab-2.3.12.dist-info/top_level.txt,sha256=Al4ZlTYE3fTJK2o6YLCDMH5_DjuQkffRBMxgmWbKaqQ,8
-unitlab-2.3.12.dist-info/RECORD,,
+unitlab-2.3.14.dist-info/LICENSE.md,sha256=Gn7RRvByorAcAaM-WbyUpsgi5ED1-bKFFshbWfYYz2Y,1069
+unitlab-2.3.14.dist-info/METADATA,sha256=xojV4DdJOJiEikB6fOw4Sr16sfqb7tsBS897suaISLU,844
+unitlab-2.3.14.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+unitlab-2.3.14.dist-info/entry_points.txt,sha256=ig-PjKEqSCj3UTdyANgEi4tsAU84DyXdaOJ02NHX4bY,45
+unitlab-2.3.14.dist-info/top_level.txt,sha256=Al4ZlTYE3fTJK2o6YLCDMH5_DjuQkffRBMxgmWbKaqQ,8
+unitlab-2.3.14.dist-info/RECORD,,