unitlab 2.3.7__tar.gz → 2.3.9__tar.gz

{unitlab-2.3.7/src/unitlab.egg-info → unitlab-2.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unitlab
-Version: 2.3.7
+Version: 2.3.9
 Home-page: https://github.com/teamunitlab/unitlab-sdk
 Author: Unitlab Inc.
 Author-email: team@unitlab.ai
@@ -24,3 +24,4 @@ Requires-Dist: validators
 Requires-Dist: psutil
 Requires-Dist: pyyaml
 Requires-Dist: jupyter
+Requires-Dist: python-dotenv

{unitlab-2.3.7 → unitlab-2.3.9}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="unitlab",
-    version="2.3.7",
+    version="2.3.9",
     license="MIT",
     author="Unitlab Inc.",
     author_email="team@unitlab.ai",
@@ -32,6 +32,7 @@ setup(
         'psutil',
         'pyyaml',
         'jupyter',
+        'python-dotenv',
         
     ],
     entry_points={

{unitlab-2.3.7 → unitlab-2.3.9}/src/unitlab/client.py

@@ -283,25 +283,24 @@ class UnitlabClient:
         self.device_id = device_id
         self.base_domain = base_domain
         
-        # Initialize tunnel manager if available
-        # Use API-based tunnel if API token is available
-        print(os.getenv('CLOUDFLARE_API_TOKEN'), 'api tokennn')
-
-        if os.getenv("CLOUDFLARE_API_TOKEN"):
+        # Always use API-based tunnel now that we have hardcoded credentials
+        # This provides better SSH/Jupyter separation with j/s prefixes
+        try:
             logger.info("Using API-based Cloudflare tunnel management")
-
             self.tunnel_manager = CloudflareAPITunnel(base_domain, device_id)
             self.jupyter_url = self.tunnel_manager.jupyter_url
             self.ssh_url = self.tunnel_manager.ssh_url
-        elif CloudflareTunnel:
-            logger.info("Using service token Cloudflare tunnel")
-            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}"
+        except Exception as e:
+            logger.warning(f"Failed to initialize API tunnel, falling back: {e}")
+            if CloudflareTunnel:
+                logger.info("Using service token Cloudflare tunnel")
+                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}"
         
         # Setup signal handlers
         signal.signal(signal.SIGINT, self._handle_shutdown)

{unitlab-2.3.7 → unitlab-2.3.9}/src/unitlab/cloudflare_api_tunnel.py

@@ -34,15 +34,17 @@ class CloudflareAPITunnel:
         # Clean device ID for subdomain
         self.clean_device_id = device_id.replace('-', '').replace('_', '').lower()[:20]
         
-        # Cloudflare IDs (hardcoded for now, can move to env vars)
+        # Cloudflare IDs - hardcoded for zero-config experience
         self.zone_id = "78182c3883adad79d8f1026851a68176"
         self.account_id = "c91192ae20a5d43f65e087550d8dc89b"
         self.tunnel_id = "0777fc10-49c4-472d-8661-f60d80d6184d"  # unitlab-agent tunnel
         
-        # API token from environment
-        self.api_token = os.getenv("CLOUDFLARE_API_TOKEN")
+        # API token - hardcoded for zero-config experience
+        # This token only has DNS edit permissions for 1scan.uz - limited scope for safety
+        self.api_token = "LJLe6QMOtpN0MeuLQ05_zUKKxVm4vEibkC8lxSJd"
+        
         if not self.api_token:
-            logger.warning("CLOUDFLARE_API_TOKEN not set. API features will be disabled.")
+            logger.warning("Using fallback tunnel configuration without API management.")
         
         # API setup
         self.api_base = "https://api.cloudflare.com/client/v4"
@@ -60,7 +62,13 @@ class CloudflareAPITunnel:
         
         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):
         """
@@ -207,14 +215,14 @@ 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 existing service token from environment
-            service_token = os.getenv(
-                "CLOUDFLARE_TUNNEL_TOKEN",
-                "eyJhIjoiYzkxMTkyYWUyMGE1ZDQzZjY1ZTA4NzU1MGQ4ZGM4OWIiLCJ0IjoiMDc3N2ZjMTAtNDljNC00NzJkLTg2NjEtZjYwZDgwZDYxODRkIiwicyI6Ik9XRTNaak5tTVdVdE1tWTRaUzAwTmpoakxUazBaalF0WXpjek1tSm1ZVGt4WlRRMCJ9"
-            )
+            # 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"
             
             # Start tunnel with service token
             cmd = [
@@ -269,6 +277,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.7 → unitlab-2.3.9/src/unitlab.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unitlab
-Version: 2.3.7
+Version: 2.3.9
 Home-page: https://github.com/teamunitlab/unitlab-sdk
 Author: Unitlab Inc.
 Author-email: team@unitlab.ai
@@ -24,3 +24,4 @@ Requires-Dist: validators
 Requires-Dist: psutil
 Requires-Dist: pyyaml
 Requires-Dist: jupyter
+Requires-Dist: python-dotenv

{unitlab-2.3.7 → unitlab-2.3.9}/src/unitlab.egg-info/requires.txt

@@ -7,3 +7,4 @@ validators
 psutil
 pyyaml
 jupyter
+python-dotenv