unitlab 2.3.28__py3-none-any.whl → 2.3.32__py3-none-any.whl

unitlab/api_tunnel.py

@@ -0,0 +1,238 @@
+#!/usr/bin/env python3
+"""
+Simple API-based Dynamic Tunnel - Each device gets deviceid.1scan.uz
+"""
+
+import subprocess
+import requests
+import json
+import time
+import os
+
+class APITunnel:
+    def __init__(self, device_id=None):
+        """Initialize with device ID"""
+        # Hardcoded Cloudflare credentials for simplicity
+        self.cf_email = "muminovbobur93@gmail.com"
+        self.cf_api_key = "1ae47782b5e2e639fb088ee73e17b74db4b4e"  # Global API Key
+        self.cf_account_id = "c91192ae20a5d43f65e087550d8dc89b"
+        self.cf_zone_id = "06ebea0ee0b228c186f97fe9a0a7c83e"  # for 1scan.uz
+        
+        # Clean device ID for subdomain
+        if device_id:
+            self.device_id = device_id.replace('-', '').replace('_', '').replace('.', '').lower()[:20]
+        else:
+            import uuid
+            self.device_id = str(uuid.uuid4())[:8]
+        
+        self.tunnel_name = "agent-{}".format(self.device_id)
+        self.subdomain = self.device_id
+        self.jupyter_url = "https://{}.1scan.uz".format(self.subdomain)
+        
+        self.tunnel_id = None
+        self.tunnel_token = None
+        self.jupyter_process = None
+        self.tunnel_process = None
+    
+    def create_tunnel_via_cli(self):
+        """Create tunnel using cloudflared CLI (simpler than API)"""
+        print("🔧 Creating tunnel: {}...".format(self.tunnel_name))
+        
+        cloudflared = self.get_cloudflared_path()
+        
+        # Login with cert (one-time if not logged in)
+        # This uses the cert.pem file if it exists
+        cert_path = os.path.expanduser("~/.cloudflared/cert.pem")
+        if not os.path.exists(cert_path):
+            print("📝 First time setup - logging in to Cloudflare...")
+            # Use service token instead of interactive login
+            # Or use the API to create tunnel
+        
+        # Create tunnel using CLI
+        cmd = [cloudflared, "tunnel", "create", self.tunnel_name]
+        result = subprocess.run(cmd, capture_output=True, text=True)
+        
+        if result.returncode == 0:
+            # Extract tunnel ID from output
+            import re
+            match = re.search(r'Created tunnel .* with id ([a-f0-9-]+)', result.stdout)
+            if match:
+                self.tunnel_id = match.group(1)
+                print("✅ Tunnel created: {}".format(self.tunnel_id))
+                
+                # Get the tunnel token
+                token_cmd = [cloudflared, "tunnel", "token", self.tunnel_name]
+                token_result = subprocess.run(token_cmd, capture_output=True, text=True)
+                if token_result.returncode == 0:
+                    self.tunnel_token = token_result.stdout.strip()
+                    return True
+        
+        print("⚠️  Could not create tunnel via CLI, using quick tunnel instead")
+        return False
+    
+    def create_dns_record(self):
+        """Add DNS record for subdomain"""
+        if not self.tunnel_id:
+            return False
+            
+        print("🔧 Creating DNS: {}.1scan.uz...".format(self.subdomain))
+        
+        url = "https://api.cloudflare.com/client/v4/zones/{}/dns_records".format(self.cf_zone_id)
+        
+        headers = {
+            "X-Auth-Email": self.cf_email,
+            "X-Auth-Key": self.cf_api_key,
+            "Content-Type": "application/json"
+        }
+        
+        data = {
+            "type": "CNAME",
+            "name": self.subdomain,
+            "content": "{}.cfargotunnel.com".format(self.tunnel_id),
+            "proxied": True
+        }
+        
+        response = requests.post(url, headers=headers, json=data)
+        if response.status_code in [200, 409]:  # 409 = already exists
+            print("✅ DNS configured")
+            return True
+        
+        print("⚠️  DNS setup failed: {}".format(response.text[:100]))
+        return False
+    
+    def get_cloudflared_path(self):
+        """Get or download cloudflared"""
+        import shutil
+        if shutil.which("cloudflared"):
+            return "cloudflared"
+        
+        local_bin = os.path.expanduser("~/.local/bin/cloudflared")
+        if os.path.exists(local_bin):
+            return local_bin
+        
+        # Download
+        print("📦 Downloading cloudflared...")
+        import platform
+        system = platform.system().lower()
+        arch = "amd64" if "x86" in platform.machine() else "arm64"
+        url = "https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-{}".format(arch)
+        
+        os.makedirs(os.path.dirname(local_bin), exist_ok=True)
+        subprocess.run("curl -L {} -o {}".format(url, local_bin), shell=True, capture_output=True)
+        subprocess.run("chmod +x {}".format(local_bin), shell=True)
+        return local_bin
+    
+    def start_jupyter(self):
+        """Start Jupyter"""
+        print("🚀 Starting Jupyter...")
+        
+        cmd = [
+            "jupyter", "notebook",
+            "--port", "8888",
+            "--no-browser",
+            "--ip", "0.0.0.0",
+            "--NotebookApp.token=''",
+            "--NotebookApp.password=''"
+        ]
+        
+        self.jupyter_process = subprocess.Popen(
+            cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+        )
+        
+        time.sleep(3)
+        print("✅ Jupyter started")
+        return True
+    
+    def start_tunnel(self):
+        """Start tunnel - try with token first, fallback to quick tunnel"""
+        cloudflared = self.get_cloudflared_path()
+        
+        if self.tunnel_token:
+            # Use token-based tunnel
+            print("🔧 Starting tunnel with token...")
+            cmd = [cloudflared, "tunnel", "run", "--token", self.tunnel_token]
+        elif self.tunnel_id:
+            # Use tunnel ID
+            print("🔧 Starting tunnel with ID...")
+            cmd = [cloudflared, "tunnel", "run", "--url", "http://localhost:8888", self.tunnel_id]
+        else:
+            # Fallback to quick tunnel
+            print("🔧 Starting quick tunnel (random URL)...")
+            cmd = [cloudflared, "tunnel", "--url", "http://localhost:8888"]
+            self.jupyter_url = "Check terminal output for URL"
+        
+        self.tunnel_process = subprocess.Popen(
+            cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+        )
+        
+        time.sleep(5)
+        print("✅ Tunnel running")
+        return True
+    
+    def start(self):
+        """Main entry point"""
+        try:
+            print("="*50)
+            print("🌐 API-Based Dynamic Tunnel")
+            print("Device: {}".format(self.device_id))
+            print("="*50)
+            
+            # Try to create named tunnel
+            tunnel_created = self.create_tunnel_via_cli()
+            
+            if tunnel_created:
+                # Add DNS record
+                self.create_dns_record()
+            
+            # Start services
+            self.start_jupyter()
+            self.start_tunnel()
+            
+            print("\n" + "="*50)
+            print("🎉 SUCCESS!")
+            if tunnel_created:
+                print("📍 Your permanent URL: {}".format(self.jupyter_url))
+            else:
+                print("📍 Using quick tunnel - check output for URL")
+            print("="*50)
+            
+            return True
+            
+        except Exception as e:
+            print("❌ Error: {}".format(e))
+            self.stop()
+            return False
+    
+    def stop(self):
+        """Stop everything"""
+        if self.jupyter_process:
+            self.jupyter_process.terminate()
+        if self.tunnel_process:
+            self.tunnel_process.terminate()
+    
+    def run(self):
+        """Run and keep alive"""
+        try:
+            if self.start():
+                print("\nPress Ctrl+C to stop...")
+                while True:
+                    time.sleep(1)
+        except KeyboardInterrupt:
+            print("\n⏹️  Shutting down...")
+            self.stop()
+
+
+def main():
+    """Test the API tunnel"""
+    import platform
+    import uuid
+    
+    hostname = platform.node().replace('.', '-')[:20]
+    device_id = "{}-{}".format(hostname, str(uuid.uuid4())[:8])
+    
+    tunnel = APITunnel(device_id=device_id)
+    tunnel.run()
+
+
+if __name__ == "__main__":
+    main()

unitlab/auto_tunnel.py

@@ -0,0 +1,174 @@
+#!/usr/bin/env python3
+"""
+Automatic Tunnel Creation - Simplest approach using cloudflared's built-in quick tunnel
+No API tokens needed!
+"""
+
+import subprocess
+import time
+import re
+import os
+
+class AutoTunnel:
+    def __init__(self, device_id=None):
+        """
+        Initialize auto tunnel - no credentials needed!
+        """
+        self.device_id = device_id or "device"
+        self.jupyter_process = None
+        self.tunnel_process = None
+        self.tunnel_url = None
+        
+    def get_cloudflared_path(self):
+        """Get or download cloudflared binary"""
+        import platform
+        
+        # Check if exists in system
+        import shutil
+        if shutil.which("cloudflared"):
+            return "cloudflared"
+        
+        # Check local
+        local_bin = os.path.expanduser("~/.local/bin/cloudflared")
+        if os.path.exists(local_bin):
+            return local_bin
+        
+        # Download it
+        print("📦 Downloading cloudflared...")
+        system = platform.system().lower()
+        if system == "linux":
+            arch = "amd64" if "x86" in platform.machine() else "arm64"
+            url = "https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-{}".format(arch)
+            
+            os.makedirs(os.path.expanduser("~/.local/bin"), exist_ok=True)
+            subprocess.run("curl -L {} -o {}".format(url, local_bin), shell=True, capture_output=True)
+            subprocess.run("chmod +x {}".format(local_bin), shell=True)
+            print("✅ cloudflared downloaded")
+            return local_bin
+        
+        return "cloudflared"
+    
+    def start_jupyter(self):
+        """Start Jupyter notebook"""
+        print("🚀 Starting Jupyter on port 8888...")
+        
+        cmd = [
+            "jupyter", "notebook",
+            "--port", "8888",
+            "--no-browser",
+            "--ip", "0.0.0.0",
+            "--NotebookApp.token=''",
+            "--NotebookApp.password=''",
+            "--NotebookApp.allow_origin='*'"
+        ]
+        
+        self.jupyter_process = subprocess.Popen(
+            cmd,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE
+        )
+        
+        time.sleep(3)
+        print("✅ Jupyter started")
+        return True
+    
+    def start_tunnel(self):
+        """Start tunnel using cloudflared quick tunnel - no auth needed!"""
+        print("🔧 Starting automatic tunnel (no credentials needed)...")
+        
+        cloudflared = self.get_cloudflared_path()
+        
+        # Use cloudflared's quick tunnel feature - generates random URL
+        cmd = [
+            cloudflared,
+            "tunnel",
+            "--url", "http://localhost:8888"
+        ]
+        
+        self.tunnel_process = subprocess.Popen(
+            cmd,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            text=True,
+            bufsize=1
+        )
+        
+        # Read output to get the tunnel URL
+        print("⏳ Waiting for tunnel URL...")
+        for _ in range(30):  # Wait up to 30 seconds
+            line = self.tunnel_process.stdout.readline()
+            if line:
+                # Look for the tunnel URL in output
+                match = re.search(r'https://[a-zA-Z0-9-]+\.trycloudflare\.com', line)
+                if match:
+                    self.tunnel_url = match.group(0)
+                    print("✅ Tunnel created: {}".format(self.tunnel_url))
+                    return True
+            time.sleep(1)
+        
+        print("❌ Failed to get tunnel URL")
+        return False
+    
+    def start(self):
+        """Start everything - super simple!"""
+        try:
+            print("="*50)
+            print("🌐 Automatic Cloudflare Tunnel (No Auth Needed!)")
+            print("Device: {}".format(self.device_id))
+            print("="*50)
+            
+            # 1. Start Jupyter
+            if not self.start_jupyter():
+                raise Exception("Failed to start Jupyter")
+            
+            # 2. Start tunnel (automatic, no credentials)
+            if not self.start_tunnel():
+                raise Exception("Failed to start tunnel")
+            
+            print("\n" + "="*50)
+            print("🎉 SUCCESS! Your Jupyter is accessible at:")
+            print("   {}".format(self.tunnel_url))
+            print("="*50)
+            print("\n⚠️  Note: This URL is temporary and random")
+            print("For persistent URLs, use Cloudflare API approach")
+            
+            return True
+            
+        except Exception as e:
+            print("❌ Error: {}".format(e))
+            self.stop()
+            return False
+    
+    def stop(self):
+        """Stop everything"""
+        if self.jupyter_process:
+            self.jupyter_process.terminate()
+        if self.tunnel_process:
+            self.tunnel_process.terminate()
+    
+    def run(self):
+        """Run and keep alive"""
+        try:
+            if self.start():
+                print("\nPress Ctrl+C to stop...")
+                while True:
+                    time.sleep(1)
+        except KeyboardInterrupt:
+            print("\n⏹️  Shutting down...")
+            self.stop()
+            print("👋 Goodbye!")
+
+
+def main():
+    """Test automatic tunnel"""
+    import platform
+    device_id = platform.node()
+    
+    print("Starting auto tunnel for: {}".format(device_id))
+    
+    tunnel = AutoTunnel(device_id=device_id)
+    tunnel.run()
+
+
+if __name__ == "__main__":
+    main()

unitlab/client.py

@@ -281,12 +281,19 @@ class UnitlabClient:
         self.device_id = device_id
         self.base_domain = base_domain
         
-        # Use the simple hardcoded tunnel approach
-        logger.info("Using simple hardcoded Cloudflare tunnel")
-        self.tunnel_manager = SimpleTunnel(device_id=self.device_id)
-        # SimpleTunnel generates the URL internally based on device_id
-        self.jupyter_url = self.tunnel_manager.jupyter_url
-        self.ssh_url = self.jupyter_url  # Same URL for both services
+        # Use persistent tunnel with API (each device gets deviceid.1scan.uz)
+        try:
+            from .persistent_tunnel import PersistentTunnel
+            logger.info("Using Persistent Tunnel with Cloudflare API")
+            self.tunnel_manager = PersistentTunnel(device_id=self.device_id)
+            # Don't call run() here - it has infinite loop. Call start() in setup_tunnels()
+            self.jupyter_url = None
+            self.ssh_url = None
+            
+        except ImportError as e:
+            logger.warning(f"Could not import PersistentTunnel: {e}")
+            # Fallback to easy tunnel
+            
         
         # Setup signal handlers
         signal.signal(signal.SIGINT, self._handle_shutdown)
@@ -392,16 +399,28 @@ class UnitlabClient:
             
             logger.info("Setting up Cloudflare tunnel...")
             
-            # SimpleTunnel handles both Jupyter and tunnel startup internally
-            # It doesn't need the jupyter_port parameter since it starts its own Jupyter
+            # Both SimpleTunnel and AutoTunnel handle Jupyter internally
             if self.tunnel_manager.start():
                 # Store the processes for monitoring
                 self.jupyter_proc = self.tunnel_manager.jupyter_process
+                # Update URLs after tunnel starts successfully
+                self.jupyter_url = self.tunnel_manager.jupyter_url
+                self.ssh_url = self.tunnel_manager.jupyter_url
+                logger.info(f"Tunnel started successfully at {self.jupyter_url}")
                 self.tunnel_proc = self.tunnel_manager.tunnel_process
-                self.jupyter_port = "8888"  # SimpleTunnel uses fixed port
+                self.jupyter_port = "8888"  # Both use fixed port
+                
+                # Get the URL (AutoTunnel generates it dynamically)
+                if hasattr(self.tunnel_manager, 'tunnel_url') and self.tunnel_manager.tunnel_url:
+                    self.jupyter_url = self.tunnel_manager.tunnel_url
+                    self.ssh_url = self.tunnel_manager.tunnel_url
+                elif hasattr(self.tunnel_manager, 'jupyter_url'):
+                    self.jupyter_url = self.tunnel_manager.jupyter_url
+                    self.ssh_url = self.tunnel_manager.jupyter_url
                 
                 # The tunnel is now running
                 logger.info("✅ Tunnel and Jupyter established")
+                logger.info("URL: {}".format(self.jupyter_url))
                 self.report_services()
                 return True
             else: