unitlab 2.3.8__tar.gz → 2.3.10__tar.gz

{unitlab-2.3.8/src/unitlab.egg-info → unitlab-2.3.10}/PKG-INFO

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

{unitlab-2.3.8 → unitlab-2.3.10}/setup.py

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

{unitlab-2.3.8 → unitlab-2.3.10}/src/unitlab/client.py

@@ -297,10 +297,10 @@ class UnitlabClient:
                 self.tunnel_manager = CloudflareTunnel(base_domain, device_id)
                 self.jupyter_url = self.tunnel_manager.jupyter_url
                 self.ssh_url = self.tunnel_manager.ssh_url
-        else:
-            self.tunnel_manager = None
-            self.jupyter_url = f"https://jupyter-{device_id}.{base_domain}"
-            self.ssh_url = f"https://ssh-{device_id}.{base_domain}"
+            else:
+                self.tunnel_manager = None
+                self.jupyter_url = f"https://jupyter-{device_id}.{base_domain}"
+                self.ssh_url = f"https://ssh-{device_id}.{base_domain}"
         
         # Setup signal handlers
         signal.signal(signal.SIGINT, self._handle_shutdown)

{unitlab-2.3.8 → unitlab-2.3.10}/src/unitlab/cloudflare_api_tunnel.py

@@ -53,16 +53,24 @@ class CloudflareAPITunnel:
             "Content-Type": "application/json"
         } if self.api_token else {}
         
-        # URLs for services
+        # URLs for services - simplified for Jupyter only
         self.jupyter_subdomain = f"j{self.clean_device_id}"
-        self.ssh_subdomain = f"s{self.clean_device_id}"
         self.jupyter_url = f"https://{self.jupyter_subdomain}.{self.base_domain}"
+        
+        # Keep SSH URLs for compatibility but they won't work yet
+        self.ssh_subdomain = f"s{self.clean_device_id}"
         self.ssh_hostname = f"{self.ssh_subdomain}.{self.base_domain}"
-        self.ssh_url = self.ssh_hostname  # For backward compatibility
+        self.ssh_url = self.ssh_hostname
         
         self.tunnel_process = None
         self.created_dns_records = []
-        self.binary_manager = CloudflaredBinaryManager()
+        
+        # Try to initialize binary manager, but don't fail if it doesn't work
+        try:
+            self.binary_manager = CloudflaredBinaryManager()
+        except Exception as e:
+            logger.warning(f"Binary manager initialization failed: {e}")
+            self.binary_manager = None
 
     def create_dns_records(self):
         """
@@ -209,14 +217,15 @@ class CloudflareAPITunnel:
                 self.create_dns_records()
                 self.update_tunnel_config()
             
-            # Get cloudflared binary
-            cloudflared_path = self.binary_manager.get_binary_path()
+            # Ensure cloudflared is available
+            cloudflared_path = self._ensure_cloudflared()
+            if not cloudflared_path:
+                raise RuntimeError("Failed to obtain cloudflared binary")
             
-            # Use the service token - hardcoded for zero-config experience
-            # This token can ONLY run the tunnel, cannot modify or delete it (safe to embed)
-            service_token = "eyJhIjoiYzkxMTkyYWUyMGE1ZDQzZjY1ZTA4NzU1MGQ4ZGM4OWIiLCJ0IjoiMDc3N2ZjMTAtNDljNC00NzJkLTg2NjEtZjYwZDgwZDYxODRkIiwicyI6Ik9XRTNaak5tTVdVdE1tWTRaUzAwTmpoakxUazBaalF0WXpjek1tSm1ZVGt4WlRRMCJ9"
+            # Use service token - simple and reliable
+            # The dashboard must have *.1scan.uz -> localhost:8888 configured
+            service_token = "eyJhIjoiYzkxMTkyYWUyMGE1ZDQzZjY1ZTA4NzU1MGQ4ZGM4OWIiLCJ0IjoiMDc3N2ZjMTAtNDljNC00NzJkLTg2NjEtZjYwZDgwZDYxODRkIiwicyI6Ik9XRTNaak5tTVdVdE1tWTRaUzAwTmpoakxTazBaalF0WXpjek1tSm1ZVGt4WlRRMCJ9"
             
-            # Start tunnel with service token
             cmd = [
                 cloudflared_path,
                 "tunnel",
@@ -269,6 +278,74 @@ class CloudflareAPITunnel:
             self.tunnel_process.wait(timeout=5)
             print("Tunnel stopped")
 
+    def _ensure_cloudflared(self):
+        """
+        Ensure cloudflared binary is available
+        Downloads it if necessary
+        """
+        print("🔍 Checking for cloudflared binary...")
+        
+        # Try binary manager first
+        if self.binary_manager:
+            try:
+                path = self.binary_manager.get_binary_path()
+                print(f"✅ Using cloudflared from binary manager: {path}")
+                return path
+            except Exception as e:
+                logger.warning(f"Binary manager failed, will download directly: {e}")
+        
+        # Direct download fallback - simplified version
+        import platform
+        import urllib.request
+        
+        cache_dir = Path.home() / '.unitlab' / 'bin'
+        cache_dir.mkdir(parents=True, exist_ok=True)
+        
+        cloudflared_path = cache_dir / 'cloudflared'
+        if platform.system() == 'Windows':
+            cloudflared_path = cache_dir / 'cloudflared.exe'
+        
+        # If already exists, use it
+        if cloudflared_path.exists():
+            print(f"✅ Using cached cloudflared: {cloudflared_path}")
+            return str(cloudflared_path)
+        
+        # Download based on platform
+        system = platform.system().lower()
+        machine = platform.machine().lower()
+        
+        print(f"📥 Downloading cloudflared for {system}/{machine}...")
+        
+        if system == 'linux':
+            if machine in ['x86_64', 'amd64']:
+                url = 'https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64'
+            elif machine in ['aarch64', 'arm64']:
+                url = 'https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-arm64'
+            else:
+                url = 'https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-386'
+        elif system == 'darwin':
+            url = 'https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-darwin-amd64.tgz'
+        elif system == 'windows':
+            url = 'https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-windows-amd64.exe'
+        else:
+            raise RuntimeError(f"Unsupported platform: {system}")
+        
+        try:
+            # Download the file
+            urllib.request.urlretrieve(url, cloudflared_path)
+            
+            # Make executable on Unix
+            if system != 'windows':
+                import stat
+                cloudflared_path.chmod(cloudflared_path.stat().st_mode | stat.S_IEXEC)
+            
+            print(f"✅ Downloaded cloudflared to: {cloudflared_path}")
+            return str(cloudflared_path)
+            
+        except Exception as e:
+            print(f"❌ Failed to download cloudflared: {e}")
+            raise RuntimeError(f"Could not download cloudflared: {e}")
+    
     def cleanup_dns(self):
         """
         Remove created DNS records (optional cleanup)

{unitlab-2.3.8 → unitlab-2.3.10/src/unitlab.egg-info}/PKG-INFO

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