fixes

Author: Chetan11-dev

bota/.gitignore

@@ -3,4 +3,5 @@ __*__
 .DS*
 src/**/package.json
 package-lock.json
-*.egg-info
+*.egg-info
+gpt/

bota/src/bota/__main__.py

@@ -6,9 +6,9 @@
 from os import path, makedirs
 
 from .package_storage import get_package_storage
-from .vm import extractRepositoryName, install_scraper_in_vm, install_ui_scraper_in_vm
+from .vm import extractRepositoryName, install_desktop_app_in_vm, install_scraper_in_vm, install_ui_scraper_in_vm
 
-@click.group(context_settings=dict(max_content_width=95))
+@click.group(context_settings=dict(max_content_width=160))
 def cli():
     """Botasaurus CLI"""
     pass
@@ -1162,7 +1162,7 @@ def convert(self, value, param, ctx):
 )
 def install_scraper(repo_url, max_retry, name):
   """
-  Clones and installs a scraper from a given GitHub repository.
+  Clones and installs a scraper from a given GitHub repository
   """
   repo_url = repo_url.strip()
 
@@ -1176,6 +1176,55 @@ def install_scraper(repo_url, max_retry, name):
 
   install_scraper_in_vm(repo_url, folder_name, max_retry)
 
+@cli.command()
+@click.option(
+    "--debian-installer-url",
+    prompt="Enter the URL to download the .deb installer",
+    required=True,
+    type=str,
+    help="URL to download the .deb package for the desktop app",
+)
+@click.option(
+    "--port",
+    default=8000,
+    type=click.IntRange(1, 65535),
+    help="Port on which the desktop app will run. Defaults to 8000",
+)
+@click.option(
+    "--skip-apache-request-routing",
+    is_flag=True,
+    help="Skip setting up Apache request routing",
+)
+@click.option(
+    "--api-path-prefix",
+    default=None,
+    type=str,
+    help="Optional API path prefix for request routing",
+)
+def install_desktop_app(debian_installer_url, port, skip_apache_request_routing, api_path_prefix):
+    """
+    Installs a desktop app in the VM using the provided .deb installer URL
+    """
+    # This command will:
+    # 1. Download and install the specified .deb package
+    # 2. Setup systemctl to run app at all times
+    # 3. Optionally configures Apache to route requests
+
+    click.echo("------------")
+    click.echo("Performing the following steps to install the desktop app:")
+    click.echo(f"    - Downloading and installing the desktop app from {debian_installer_url}")
+    click.echo("    - Setting up systemctl to run app at all times")
+    if not skip_apache_request_routing:
+        click.echo("    - Configuring Apache request routing")
+    click.echo("------------")    
+    print(debian_installer_url, port, skip_apache_request_routing, api_path_prefix)
+    # Call the actual implementation (to be defined elsewhere)
+    install_desktop_app_in_vm(
+        debian_installer_url.strip(),
+        port,
+        skip_apache_request_routing,
+        api_path_prefix.strip() if api_path_prefix else None
+    )
 
 @cli.command()
 def switch_project():

bota/src/bota/vm.py

@@ -52,7 +52,6 @@ def get_vm_ip():
 
 def create_visit_ip_text(ip):
     return "Hurray! your scraper is up and running. Visit http://{}/ to use it.".format(ip)
-
 def wait_till_up(ip):
     """
     Polls the given IP address every 10 seconds for 180 seconds to check if it's up.
@@ -63,11 +62,11 @@ def wait_till_up(ip):
     Raises:
     Exception: If the IP is not up after 180 seconds.
     """
-    timeout = 180  # Total time to wait in seconds
+    timeout = 60  # Total time to wait in seconds
     interval = 1  # Time to wait between checks in seconds
-    elapsed_time = 0
+    end_time = time.time() + timeout
 
-    while elapsed_time <= timeout:
+    while time.time() < end_time:
         try:
             # Attempt to connect to the IP address
             response = requests.get(f"http://{ip}/api", timeout=5)
@@ -80,7 +79,6 @@ def wait_till_up(ip):
             pass
 
         time.sleep(interval)
-        elapsed_time += interval
 
     # If the function hasn't returned after the loop, raise an exception
     raise Exception(f"The VM at http://{ip}/ is not up after {timeout} seconds. Please check the logs using "
@@ -479,6 +477,7 @@ def install_scraper_in_vm(git_repo_url, folder_name, max_retry):
     install_scraper(git_repo_url, folder_name, max_retry)
     click.echo("Successfully installed the Scraper.")
     # todo check status is it running or error?
+
 def get_filename_from_url(url):
         from urllib.parse import urlparse
         return os.path.basename(urlparse(url).path.rstrip("/"))
@@ -490,8 +489,11 @@ def install_desktop_app_in_vm(
         api_path_prefix
     ):
     # Validate api_path_prefix
-    api_path_prefix = api_path_prefix if api_path_prefix else ""
-    if api_path_prefix:
+    api_path_prefix = os.path.normpath(api_path_prefix) if api_path_prefix else ""
+    
+    if api_path_prefix == ".":
+        api_path_prefix = ""
+    elif api_path_prefix:
         if not api_path_prefix.startswith("/"):
             api_path_prefix = "/" + api_path_prefix
         if api_path_prefix.endswith("/"):
@@ -506,8 +508,7 @@ def install_desktop_app_in_vm(
     default_name = get_filename_from_url(debian_installer_url)
 
     delete_installer(default_name)
-    wget_command = f"wget {debian_installer_url}"
-    subprocess.run(wget_command, shell=True, check=True, stderr=subprocess.STDOUT)
+    subprocess.run(["wget", debian_installer_url], check=True, stderr=subprocess.STDOUT)
     install_command = f"sudo apt --fix-broken install ./{default_name} -y"
     subprocess.run(install_command, shell=True, check=True, stderr=subprocess.STDOUT)
     package_name = subprocess.check_output(f"dpkg-deb -f ./{default_name} Package", shell=True).decode().strip()
@@ -531,7 +532,8 @@ def install_desktop_app_in_vm(
     package_service_name = f"{package_name}.service"
     package_service_content = f"""[Unit]
 Description={package_name} Service
-After=network.target
+After=network.target {xvfb_service_name}
+Requires={xvfb_service_name}
 StartLimitInterval=0
 [Service]
 Type=simple
@@ -565,7 +567,7 @@ def install_desktop_app_in_vm(
     click.echo("Now, Checking API Status...")
     ip = get_vm_ip()
     wait_till_desktop_api_up(ip, api_path_prefix)
-    click.echo(f"Hurray! your desktop app is up and running. Visit http://{ip}{api_path_prefix}/ to see the API Docs.")
+    click.echo(f"Hurray! your desktop app is up and running. Visit http://{ip}{api_path_prefix or "/"} to see the API Docs.")
 
 def delete_installer(default_name):
     if os.path.exists(default_name):
@@ -577,8 +579,8 @@ def setup_apache_load_balancer_desktop_app(port, api_path_prefix):
     DocumentRoot /var/www/html
     ErrorLog ${{APACHE_LOG_DIR}}/error.log
     CustomLog ${{APACHE_LOG_DIR}}/access.log combined
-    ProxyPass {api_path_prefix}/ http://127.0.0.1:{port}{api_path_prefix}/
-    ProxyPassReverse {api_path_prefix}/ http://127.0.0.1:{port}{api_path_prefix}/
+    ProxyPass {api_path_prefix or "/"} http://127.0.0.1:{port}{api_path_prefix or "/"}
+    ProxyPassReverse {api_path_prefix or "/"} http://127.0.0.1:{port}{api_path_prefix or "/"}
 </VirtualHost>"""
     write_file_sudo(apache_conf, "/etc/apache2/sites-available/000-default.conf")
 
@@ -587,7 +589,12 @@ def validate_url(url):
         response = requests.head(url, allow_redirects=True, timeout=20)
         response.raise_for_status()
     except requests.exceptions.RequestException as e:
-        raise Exception(f"URL validation failed: {e}")
+        # Retry with GET if HEAD fails (some servers don't support HEAD)
+        try:
+            response = requests.get(url, allow_redirects=True, timeout=20)
+            response.raise_for_status()
+        except requests.exceptions.RequestException as e2:
+            raise Exception(f"The URL {url} does not point to a valid Debian installer.")
 
 def wait_till_desktop_api_up(ip, api_path_prefix):
     """
@@ -600,14 +607,17 @@ def wait_till_desktop_api_up(ip, api_path_prefix):
     Raises:
     Exception: If the IP is not up after 180 seconds.
     """
-    timeout = 180  # Total time to wait in seconds
+    timeout = 60  # Total time to wait in seconds
     interval = 1  # Time to wait between checks in seconds
-    elapsed_time = 0
+    end_time = time.time() + timeout
 
-    while elapsed_time <= timeout:
+    while time.time() < end_time:
         try:
             # Attempt to connect to the IP address
-            response = requests.get(f"http://{ip}{api_path_prefix}/ui/app-props", timeout=5)
+            if api_path_prefix:
+                response = requests.get(f"http://{ip}{api_path_prefix}/ui/app-props", timeout=5)
+            else:
+                response = requests.get(f"http://{ip}/ui/app-props", timeout=5)
 
             # If the response is successful, return without raising an exception
             if response.status_code == 200:
@@ -617,10 +627,10 @@ def wait_till_desktop_api_up(ip, api_path_prefix):
             pass
 
         time.sleep(interval)
-        elapsed_time += interval
-
     # If the function hasn't returned after the loop, raise an exception
-    raise Exception(f"The Desktop App at http://{ip}/ is not up after {timeout} seconds.")
+    raise Exception(
+        f"The Desktop Api at http://{ip}/ is not up after {timeout} seconds. Are you sure you have enabled the Api in api-config.ts?"
+    )
 
 # python -m bota.vm 
 if __name__ == "__main__":