unitlab 2.3.38__tar.gz → 2.3.40__tar.gz

{unitlab-2.3.38/src/unitlab.egg-info → unitlab-2.3.40}/PKG-INFO

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

{unitlab-2.3.38 → unitlab-2.3.40}/setup.py

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

{unitlab-2.3.38 → unitlab-2.3.40}/src/unitlab/persistent_tunnel.py

@@ -56,24 +56,7 @@ class PersistentTunnel:
         self.jupyter_process = None
         self.tunnel_process = None
     
-    def get_zone_id(self):
-        """Get Zone ID for unitlab-ai.com"""
-        print("🔍 Getting Zone ID for {}...".format(self.domain))
-        
-        url = "https://api.cloudflare.com/client/v4/zones"
-        headers = self._get_headers()
-        params = {"name": self.domain}
-        
-        response = requests.get(url, headers=headers, params=params)
-        if response.status_code == 200:
-            data = response.json()
-            if data["result"]:
-                self.cf_zone_id = data["result"][0]["id"]
-                print("✅ Zone ID: {}".format(self.cf_zone_id))
-                return self.cf_zone_id
-        
-        print("❌ Could not get Zone ID")
-        return None
+    
     
     def _get_headers(self):
         """Get API headers for Global API Key"""
@@ -85,32 +68,14 @@ class PersistentTunnel:
         } 
     
     def get_or_create_tunnel(self):
-        """Get existing tunnel or create a new one"""
-        # First, check if tunnel already exists
-        print("🔍 Checking for existing tunnel: {}...".format(self.tunnel_name))
-        
-        list_url = "https://api.cloudflare.com/client/v4/accounts/{}/cfd_tunnel".format(self.cf_account_id)
-        headers = self._get_headers()
-        
-        # Check if tunnel exists
-        response = requests.get(list_url, headers=headers)
-        if response.status_code == 200:
-            tunnels = response.json().get("result", [])
-            for tunnel in tunnels:
-                if tunnel["name"] == self.tunnel_name:
-                    print("✅ Found existing tunnel: {}".format(tunnel["id"]))
-                    self.tunnel_id = tunnel["id"]
-                    
-                    # Tunnel exists, create a new one with unique name
-                    print("⚠️  Tunnel with this name already exists")
-                    import uuid
-                    unique_suffix = str(uuid.uuid4())[:8]
-                    self.tunnel_name = "agent-{}-{}".format(self.device_id, unique_suffix)
-                    print("🔄 Creating new tunnel with unique name: {}".format(self.tunnel_name))
-                    # Don't break, let it continue to create new tunnel
-                    return self.create_new_tunnel()
-        
-        # Create new tunnel
+        """Always create a new tunnel with unique name to avoid conflicts"""
+        # Generate unique tunnel name to avoid conflicts
+        import uuid
+        unique_suffix = str(uuid.uuid4())[:8]
+        self.tunnel_name = "agent-{}-{}".format(self.device_id, unique_suffix)
+        print("🔧 Creating tunnel: {}...".format(self.tunnel_name))
+        
+        # Always create new tunnel
         return self.create_new_tunnel()
     
     def create_new_tunnel(self):
@@ -160,9 +125,7 @@ class PersistentTunnel:
         
         print("🔧 Creating DNS records...")
         
-        # Get zone ID if we don't have it
-        if self.cf_zone_id == "NEED_ZONE_ID_FOR_1SCAN_UZ":
-            self.get_zone_id()
+        # self.get_zone_id()
         
         url = "https://api.cloudflare.com/client/v4/zones/{}/dns_records".format(self.cf_zone_id)
         headers = self._get_headers()
@@ -186,7 +149,32 @@ class PersistentTunnel:
             print("❌ Failed to create main DNS: {}".format(response.text[:200]))
             return False
         
-        # Create SSH subdomain record (s{deviceid}.unitlab-ai.com)
+        # First, check if SSH DNS record exists and delete it
+        print("🔍 Checking for existing SSH DNS record: {}.{}".format(self.ssh_subdomain, self.domain))
+        list_url = "{}?name={}.{}".format(url, self.ssh_subdomain, self.domain)
+        list_response = requests.get(list_url, headers=headers)
+        
+        if list_response.status_code == 200:
+            records = list_response.json().get("result", [])
+            print("Found {} existing DNS records".format(len(records)))
+            print('this is new version')
+            for record in records:
+                if record["name"] == "{}.{}".format(self.ssh_subdomain, self.domain):
+                    record_id = record["id"]
+                    print("🗑️  Deleting old SSH DNS record: {}".format(record_id))
+                    delete_url = "{}/{}".format(url, record_id)
+                    delete_response = requests.delete(delete_url, headers=headers)
+                    if delete_response.status_code in [200, 204]:
+                        print("✅ Deleted old SSH DNS record")
+                    else:
+                        print("⚠️  Could not delete old SSH DNS record: {}".format(delete_response.text[:200]))
+        else:
+            print("⚠️  Could not list DNS records: {}".format(list_response.text[:200]))
+        
+        # Wait a moment for DNS deletion to propagate
+        time.sleep(2)
+        
+        # Create new SSH subdomain record pointing to new tunnel
         ssh_data = {
             "type": "CNAME",
             "name": self.ssh_subdomain,
@@ -195,31 +183,22 @@ class PersistentTunnel:
             "ttl": 1
         }
         
+        print("📝 Creating SSH DNS record: {} -> {}".format(self.ssh_subdomain, self.tunnel_id))
         ssh_response = requests.post(url, headers=headers, json=ssh_data)
         
         if ssh_response.status_code in [200, 201]:
             print("✅ SSH DNS record created: {}.{}".format(self.ssh_subdomain, self.domain))
-        elif "already exists" in ssh_response.text:
-            print("⚠️  SSH DNS record already exists, deleting and recreating...")
-            # Delete the old record and create new one
-            list_url = "{}?name={}.{}".format(url, self.ssh_subdomain, self.domain)
-            list_response = requests.get(list_url, headers=headers)
-            if list_response.status_code == 200:
-                records = list_response.json().get("result", [])
-                if records:
-                    record_id = records[0]["id"]
-                    delete_url = "{}/{}".format(url, record_id)
-                    requests.delete(delete_url, headers=headers)
-                    print("Deleted old SSH DNS record")
-                    # Try again
-                    ssh_response = requests.post(url, headers=headers, json=ssh_data)
-                    if ssh_response.status_code in [200, 201]:
-                        print("✅ SSH DNS record recreated: {}.{}".format(self.ssh_subdomain, self.domain))
-                    else:
-                        print("❌ Failed to recreate SSH DNS: {}".format(ssh_response.text[:200]))
+            print("   Points to: {}.cfargotunnel.com".format(self.tunnel_id))
         else:
-            print("❌ Could not create SSH DNS: {}".format(ssh_response.text[:200]))
-            # SSH is optional, so we continue even if SSH DNS fails
+            print("❌ Failed to create SSH DNS: Status {} - {}".format(ssh_response.status_code, ssh_response.text))
+            # Try to parse error
+            try:
+                error_data = ssh_response.json()
+                if "errors" in error_data:
+                    for error in error_data["errors"]:
+                        print("   Error: {}".format(error.get("message", error)))
+            except:
+                pass
         
         return True
     
@@ -261,6 +240,7 @@ class PersistentTunnel:
             
             policy_response = requests.post(policy_url, headers=headers, json=policy_data)
             
+            
             if policy_response.status_code in [200, 201]:
                 print("✅ Bypass policy created - SSH is publicly accessible")
                 return True

{unitlab-2.3.38 → unitlab-2.3.40/src/unitlab.egg-info}/PKG-INFO

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