lanscape 2.1.2__py3-none-any.whl → 2.2.0a3__py3-none-any.whl

lanscape/ui/main.py

@@ -1,17 +1,19 @@
 """Main entry point for the LANscape application when running as a module."""
 import socket
 
-
-import threading
 import time
 import logging
 import traceback
 import os
+from subprocess import Popen
+import webbrowser
 import requests
 
+from pwa_launcher import open_pwa, ChromiumNotFoundError
+
+
 from lanscape.core.logger import configure_logging
 from lanscape.core.runtime_args import parse_args
-from lanscape.core.web_browser import open_webapp
 from lanscape.core.version_manager import get_installed_version, is_update_available
 from lanscape.ui.app import start_webserver_daemon, start_webserver
 # do this so any logs generated on import are displayed
@@ -70,7 +72,7 @@ def try_check_update():
         log.warning('Unable to check for updates.')
 
 
-def open_browser(url: str, wait=2) -> bool:
+def open_browser(url: str, wait=2) -> Popen:
     """
     Open a browser window to the specified
     url after waiting for the server to start
@@ -78,12 +80,18 @@ def open_browser(url: str, wait=2) -> bool:
     try:
         time.sleep(wait)
         log.info(f'Starting UI - http://127.0.0.1:{args.port}')
-        return open_webapp(url)
-
+        return open_pwa(url)
+
+    except ChromiumNotFoundError:
+        success = webbrowser.open(url)
+        if success:
+            log.warning("Chromium browser not found. Falling back to default web browser.")
+        else:
+            log.warning(f"Cannot find any web browser. LANScape UI running on {url}")
     except BaseException:
         log.debug(traceback.format_exc())
         log.info(f'Unable to open web browser, server running on {url}')
-    return False
+    return None
 
 
 def start_webserver_ui():
@@ -97,19 +105,16 @@ def start_webserver_ui():
         # if it was, dont open the browser again
         log.info('Opening UI as daemon')
         if not IS_FLASK_RELOAD:
-            threading.Thread(
-                target=open_browser,
-                args=(uri,),
-                daemon=True
-            ).start()
+            open_browser(uri)
         start_webserver(args)
     else:
         flask_thread = start_webserver_daemon(args)
-        app_closed = open_browser(uri)
+        proc = open_browser(uri)
+        if proc:
+            app_closed = proc.wait()
+        else:
+            app_closed = False
 
-        # depending on env, open_browser may or
-        # may not be coupled with the closure of UI
-        # (if in browser tab, it's uncoupled)
         if not app_closed or args.persistent:
             # not doing a direct join so i can still
             # terminate the app with ctrl+c

{lanscape-2.1.2.dist-info → lanscape-2.2.0a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 2.1.2
+Version: 2.2.0a3
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 License-Expression: MIT
@@ -25,6 +25,7 @@ Requires-Dist: scapy<3.0,>=2.3.2
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: pydantic
 Requires-Dist: icmplib
+Requires-Dist: pwa-launcher>=0.5.0
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0; extra == "dev"
 Requires-Dist: pytest-cov>=5.0; extra == "dev"

{lanscape-2.1.2.dist-info → lanscape-2.2.0a3.dist-info}/RECORD

@@ -15,7 +15,6 @@ lanscape/core/scan_config.py,sha256=A2ZKXqXKW9nrP6yLb7b9b3XqSY_cQB3LZ5K0LVCSebE,
 lanscape/core/service_scan.py,sha256=wTDxOdazOsbI0hwCBR__4UCmB2RIbl2pw3F2YUW9aaE,6428
 lanscape/core/subnet_scan.py,sha256=PtSOk92dK05-reyr8LBkOXaI15qpYnar5nDqALCX1tQ,14850
 lanscape/core/version_manager.py,sha256=eGjyKgsv31QO0W26se9pPQ1TwmEN8qn37dHULtoocqc,2841
-lanscape/core/web_browser.py,sha256=23MuGIrBYdGhw6ejj6OWxwReeKIlWhtWukc1dKV_3_0,6736
 lanscape/resources/mac_addresses/convert_csv.py,sha256=hvlyLs0XmuuhBuvXBNRGP1cKJzYVRSf8VfUJ1VqROms,1189
 lanscape/resources/mac_addresses/mac_db.json,sha256=Lng2yJerwO7vjefzxzgtE203hry1lIsCadHL1A5Rptg,2136137
 lanscape/resources/ports/convert_csv.py,sha256=MMLDa-5pGMsn4A2_k45jHsRYffrRY_0Z2D1ziiikeQA,1143
@@ -27,7 +26,7 @@ lanscape/resources/ports/test_port_list_scan.json,sha256=qXuWGQ_sGIRCVrhJxMeWcHK
 lanscape/resources/services/definitions.jsonc,sha256=M9BDeK-mh25sEVj8xDEYbU2ix7EETVWhbiYmMb14Gjg,20905
 lanscape/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lanscape/ui/app.py,sha256=rg4UGHgbVHpU2jdabSwBoSqGna7WGOunPkPc5Tvds9w,4076
-lanscape/ui/main.py,sha256=UCrhHnyFBqVmHTMus33CTp3vdNn3miT1xXJatR4N7ho,4176
+lanscape/ui/main.py,sha256=xgsf3QCLsIsdHX03xTalXJ63p11vJWo2u54ODEmKoCA,4327
 lanscape/ui/shutdown_handler.py,sha256=HrEnWrdYSzLDVsPgD8tf9FgtAwQrZNECDu6wnEs27EY,1704
 lanscape/ui/blueprints/__init__.py,sha256=EjPtaR5Nh17pGiOVYTJULVNaZntpFZOiYyep8rBWAiE,265
 lanscape/ui/blueprints/api/__init__.py,sha256=5Z4Y7B36O-bNFenpomfuNhPuJ9dW_MC0TPUU3pCFVfA,103
@@ -69,9 +68,9 @@ lanscape/ui/templates/scan/ip-table-row.html,sha256=iSW3PYev3_k7pxTZUJUboqDUgdhs
 lanscape/ui/templates/scan/ip-table.html,sha256=AT2ZvCPYdKl-XJiAkEAawPOVuQw-w0MXumGQTr3zyKM,926
 lanscape/ui/templates/scan/overview.html,sha256=xWj9jWDPg2KcPLvS8fnSins23_UXjKCdb2NJwNG2U2Q,1176
 lanscape/ui/templates/scan/scan-error.html,sha256=wmAYQ13IJHUoO8fAGNDjMvNml7tu4rsIU3Vav71ETlA,999
-lanscape-2.1.2.dist-info/licenses/LICENSE,sha256=VLoE0IrNTIc09dFm7hMN0qzk4T3q8V0NaPcFQqMemDs,1070
-lanscape-2.1.2.dist-info/METADATA,sha256=oxHxoHbAYnhTnSIgsMyzzgqevSrWmF5Fzti1bqjLAao,3578
-lanscape-2.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lanscape-2.1.2.dist-info/entry_points.txt,sha256=evxSxUikFa1OEd4e0Boky9sLH87HdgM0YqB_AbB2HYc,51
-lanscape-2.1.2.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
-lanscape-2.1.2.dist-info/RECORD,,
+lanscape-2.2.0a3.dist-info/licenses/LICENSE,sha256=VLoE0IrNTIc09dFm7hMN0qzk4T3q8V0NaPcFQqMemDs,1070
+lanscape-2.2.0a3.dist-info/METADATA,sha256=li6uvk8iCT3y43dvRKjuLhn-lcN6_rk2KAJ4GPuurNg,3615
+lanscape-2.2.0a3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lanscape-2.2.0a3.dist-info/entry_points.txt,sha256=evxSxUikFa1OEd4e0Boky9sLH87HdgM0YqB_AbB2HYc,51
+lanscape-2.2.0a3.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
+lanscape-2.2.0a3.dist-info/RECORD,,

lanscape/core/web_browser.py

@@ -1,210 +0,0 @@
-"""
-Get the executable path of the system’s default web browser.
-
-Supports:
-  - Windows (reads from the registry)
-  - Linux   (uses xdg-mime / xdg-settings + .desktop file parsing)
-"""
-
-import sys
-import os
-import subprocess
-import webbrowser
-import logging
-import re
-import time
-from typing import Optional
-
-log = logging.getLogger('WebBrowser')
-
-
-def open_webapp(url: str) -> bool:
-    """
-    will try to open the web page as an app
-    on failure, will open as a tab in default browser
-
-    returns:
-    """
-    start = time.time()
-    try:
-        exe = get_default_browser_executable()
-        if not exe:
-            raise RuntimeError('Unable to find browser binary')
-        log.debug(f'Opening {url} with {exe}')
-
-        cmd = f'"{exe}" --app="{url}"'
-        subprocess.run(cmd, check=True, shell=True)
-
-        if time.time() - start < 2:
-            log.debug(
-                'Unable to hook into closure of UI, listening for flask shutdown')
-            return False
-        return True
-
-    except Exception as e:
-        log.warning(
-            'Failed to open webpage as app, falling back to browser tab')
-        log.debug(f'As app error: {e}')
-        try:
-            success = webbrowser.open(url)
-            log.debug(f'Opened {url} in browser tab: {success}')
-            if not success:
-                # pylint: disable=raise-missing-from
-                raise RuntimeError(
-                    'Unknown error while opening browser tab') from e
-        except Exception as e2:
-            log.warning(
-                'Exhausted all options to open browser, you need to open manually')
-            log.debug(f'As tab error: {e2}')
-            log.info(f'LANScape UI is running on {url}')
-    return False
-
-
-def get_default_browser_executable() -> Optional[str]:
-    """Platform-agnostic method to get the default browser executable path."""
-    if sys.platform.startswith("win"):
-        return windows_get_browser_from_registry()
-
-    if sys.platform.startswith("linux"):
-        return linux_get_browser_executable()
-
-    if sys.platform.startswith("darwin"):
-        # macOS: try to find Chrome first for app mode support, fallback to default
-        try:
-            p = subprocess.run(
-                ["mdfind", "kMDItemCFBundleIdentifier == 'com.google.Chrome'"],
-                capture_output=True, text=True, check=True
-            )
-            chrome_paths = p.stdout.strip().split('\n')
-            if chrome_paths and chrome_paths[0]:
-                return f"{chrome_paths[0]}/Contents/MacOS/Google Chrome"
-        except subprocess.CalledProcessError:
-            pass
-
-        # Fallback to system default
-        return "/usr/bin/open"
-
-    # Unsupported platform
-    return None
-
-
-def linux_get_browser_executable() -> Optional[str]:
-    """Get the default web browser executable path on Linux."""
-    # First, find the .desktop file name
-    desktop_file = None
-    try:
-        # Try xdg-mime
-        p = subprocess.run(
-            ["xdg-mime", "query", "default", "x-scheme-handler/http"],
-            capture_output=True, text=True,
-            check=True
-        )
-        desktop_file = p.stdout.strip()
-    except subprocess.CalledProcessError:
-        pass
-
-    if not desktop_file:
-        # Fallback to xdg-settings
-        try:
-            p = subprocess.run(
-                ["xdg-settings", "get", "default-web-browser"],
-                capture_output=True, text=True,
-                check=True
-            )
-            desktop_file = p.stdout.strip()
-        except subprocess.CalledProcessError:
-            pass
-
-    # Final fallback: BROWSER environment variable
-    if not desktop_file:
-        return os.environ.get("BROWSER")
-
-    # Look for that .desktop file in standard locations
-    search_paths = [
-        os.path.expanduser("~/.local/share/applications"),
-        "/usr/local/share/applications",
-        "/usr/share/applications",
-    ]
-
-    exec_cmd = None
-    for path in search_paths:
-        full_path = os.path.join(path, desktop_file)
-        if os.path.isfile(full_path):
-            with open(full_path, encoding="utf-8", errors="ignore") as f:
-                for line in f:
-                    if line.startswith("Exec="):
-                        exec_cmd = line[len("Exec="):].strip()
-                        # strip arguments like "%u", "--flag", etc.
-                        exec_cmd = exec_cmd.split()[0]
-                        exec_cmd = exec_cmd.split("%")[0]
-                        return exec_cmd
-
-    return exec_cmd
-
-
-def windows_get_browser_from_registry() -> Optional[str]:
-    """Get the default web browser executable path on Windows."""
-    # Import winreg only on Windows platforms
-    if not sys.platform.startswith("win"):
-        return None
-
-    try:
-        import winreg  # pylint: disable=import-outside-toplevel
-    except ImportError:
-        log.debug("winreg module not available")
-        return None
-
-    def get_reg(base, path, key=None):
-        """Helper function to read a registry key."""
-        try:
-            with winreg.OpenKey(base, path) as reg:
-                return winreg.QueryValueEx(reg, key)[0]
-        except FileNotFoundError:
-            return None
-
-    def extract_executable(cmd: str) -> Optional[str]:
-        """Extract the executable path from a command string."""
-        match = re.match(r'"?([^"]+)"?', cmd)
-        return match.group(1) if match else None
-
-    def get_user_preferred_browser():
-        """Get the user preferred browser from the registry."""
-        progid = get_reg(
-            winreg.HKEY_CURRENT_USER,
-            r'Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice',
-            'ProgId'
-        )
-        if not progid:
-            log.debug('No user preferred browser found in registry')
-            return None
-
-        browser_path = get_reg(
-            winreg.HKEY_CLASSES_ROOT,
-            f'{progid}\\shell\\open\\command'
-        )
-
-        if not browser_path:
-            log.debug(f'progid {progid} does not have a command in registry')
-            return None
-
-        return extract_executable(browser_path)
-
-    def get_system_default_browser():
-        """Get the system default browser from the registry."""
-        reg = get_reg(
-            winreg.HKEY_CLASSES_ROOT,
-            r'http\shell\open\command'
-        )
-        if not reg:
-            log.debug('No system default browser found in registry')
-            return None
-
-        return extract_executable(reg)
-
-    user_browser = get_user_preferred_browser()
-    if user_browser:
-        return extract_executable(user_browser)
-
-    system_browser = get_system_default_browser()
-    if system_browser:
-        return extract_executable(system_browser)