lanscape 1.3.0a6__py3-none-any.whl → 1.3.1__py3-none-any.whl

lanscape/libraries/net_tools.py

@@ -9,7 +9,9 @@ import traceback
 import subprocess
 from time import sleep
 from typing import List, Dict
-from scapy.all import ARP, Ether, srp
+from scapy.sendrecv import srp
+from scapy.layers.l2 import ARP, Ether
+from scapy.error import Scapy_Exception
 from concurrent.futures import ThreadPoolExecutor, as_completed
 
 from .service_scan import scan_service
@@ -38,13 +40,19 @@ class IPAlive:
         for future in as_completed(futures):
             try:
                 if future.result():
-                    # one check succeeded — don’t block on the other
-                    executor.shutdown(wait=False, cancel_futures=True)
+                    # one check succeeded — don't block on the other
+                    # Cancel remaining futures in a version-compatible way
+                    for f in futures:
+                        if not f.done():
+                            f.cancel()
+                    
+                    executor.shutdown(wait=False)  # Python 3.8 compatible
                     return True
             except Exception as e:
                 # treat any error as a False response
+                log.debug(f'Error while checking {ip}: {e}')
                 self.caught_errors.append(DeviceError(e))
-                pass
+
 
         # neither check found the host alive
         executor.shutdown()
@@ -60,7 +68,7 @@ class IPAlive:
 
     def _ping_lookup(
         self, host: str,
-        retries: int = 1,
+        retries: int = 2,
         retry_delay: int = .25,
         ping_count: int = 2,
         timeout: int = 2
@@ -70,20 +78,35 @@ class IPAlive:
         if os_name == "windows":
             # -n count, -w timeout in ms
             cmd = ['ping', '-n', str(ping_count), '-w', str(timeout*1000)]
-        else:
+        else:  # Linux, macOS, and other Unix-like systems
             # -c count, -W timeout in s
             cmd = ['ping', '-c', str(ping_count), '-W', str(timeout)]
 
+        cmd = cmd + [host]
+
         for r in range(retries):
             try:
-                output = subprocess.check_output(
-                    cmd + [host],
-                    stderr=subprocess.STDOUT,
-                    universal_newlines=True
+                proc = subprocess.run(
+                    cmd,
+                    text=True,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE
                 )
-                # Windows/Linux both include “TTL” on a successful reply
-                if 'TTL' in output.upper():
-                    return True
+                
+                if proc.returncode == 0:
+                    output = proc.stdout.lower()
+
+                    # Windows/Linux both include “TTL” on a successful reply
+                    if psutil.WINDOWS or psutil.LINUX:
+                        if 'ttl' in output:
+                            return True
+                    # some distributions of Linux and macOS
+                    if psutil.MACOS or psutil.LINUX:
+                        bad = '100.0% packet loss'
+                        good = 'ping statistics'
+                        # mac doesnt include TTL, so we check good is there, and bad is not
+                        if good in output and bad not in output:
+                            return True
             except subprocess.CalledProcessError as e:
                 self.caught_errors.append(DeviceError(e))
                 pass
@@ -205,9 +228,9 @@ mac_selector = MacSelector()
 
 def get_ip_address(interface: str):
     """
-    Get the IP address of a network interface on Windows or Linux.
+    Get the IP address of a network interface on Windows, Linux, or macOS.
     """
-    def linux():
+    def unix_like():  # Combined Linux and macOS
         try:
             import fcntl
             import struct
@@ -233,17 +256,15 @@ def get_ip_address(interface: str):
     # Call the appropriate function based on the platform
     if psutil.WINDOWS:
         return windows()
-    elif psutil.LINUX:
-        return linux()
-    else:
-        return None
+    else:  # Linux, macOS, and other Unix-like systems
+        return unix_like()
 
 def get_netmask(interface: str):
     """
     Get the netmask of a network interface.
     """
     
-    def linux():
+    def unix_like():  # Combined Linux and macOS
         try:
             import fcntl
             sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
@@ -267,7 +288,8 @@ def get_netmask(interface: str):
     
     if psutil.WINDOWS:
         return windows()
-    return linux()
+    else:  # Linux, macOS, and other Unix-like systems
+        return unix_like()
 
 def get_cidr_from_netmask(netmask: str):
     """
@@ -278,20 +300,65 @@ def get_cidr_from_netmask(netmask: str):
 
 def get_primary_interface():
     """
-    Get the primary network interface based on the default gateway.
+    Get the primary network interface that is likely handling internet traffic.
+    Uses heuristics to identify the most probable interface.
     """
-    # Get the default gateway information
-    gateways = psutil.net_if_addrs()
-    default_gw = psutil.net_if_stats()
-
-    # Iterate over the default gateways
-    for interface, addrs in gateways.items():
-        if default_gw[interface].isup:  # Ensure the interface is up
-            for addr in addrs:
-                if addr.family == socket.AF_INET:  # Look for IPv4 addresses
-                    return interface
-
-    return None
+    # Try to find the interface with the default gateway
+    try:
+        if psutil.WINDOWS:
+            # On Windows, parse route print output
+            output = subprocess.check_output("route print 0.0.0.0", shell=True, text=True)
+            lines = output.strip().split('\n')
+            for line in lines:
+                if '0.0.0.0' in line and 'Gateway' not in line:  # Skip header
+                    parts = [p for p in line.split() if p]
+                    if len(parts) >= 4:
+                        interface_idx = parts[3]
+                        # Find interface name in the output
+                        for iface_name, addrs in psutil.net_if_addrs().items():
+                            if str(interface_idx) in iface_name:
+                                return iface_name
+        else:
+            # Linux/Unix/Mac - use ip route or netstat
+            try:
+                output = subprocess.check_output("ip route show default 2>/dev/null || netstat -rn | grep default", 
+                                               shell=True, text=True)
+                for line in output.split('\n'):
+                    if 'default via' in line and 'dev' in line:
+                        return line.split('dev')[1].split()[0]
+                    elif 'default' in line:
+                        parts = line.split()
+                        if len(parts) > 3:
+                            return parts[-1]  # Interface is usually the last column
+            except (subprocess.SubprocessError, IndexError, FileNotFoundError):
+                pass
+    except Exception as e:
+        log.debug(f"Error determining primary interface: {e}")
+    
+    # Fallback: Identify likely candidates based on heuristics
+    candidates = []
+    
+    for interface, addrs in psutil.net_if_addrs().items():
+        stats = psutil.net_if_stats().get(interface)
+        if stats and stats.isup:
+            ipv4_addrs = [addr for addr in addrs if addr.family == socket.AF_INET]
+            if ipv4_addrs:
+                # Skip loopback and common virtual interfaces
+                is_loopback = any(addr.address.startswith('127.') for addr in ipv4_addrs)
+                is_virtual = any(name in interface.lower() for name in 
+                                ['loop', 'vmnet', 'vbox', 'docker', 'virtual', 'veth'])
+                
+                if not is_loopback and not is_virtual:
+                    candidates.append(interface)
+    
+    # Prioritize interfaces with names typically used for physical connections
+    for prefix in ['eth', 'en', 'wlan', 'wifi', 'wl', 'wi']:
+        for interface in candidates:
+            if interface.lower().startswith(prefix):
+                return interface
+    
+    # Otherwise return the first candidate or None
+    return candidates[0] if candidates else None
 
 def get_host_ip_mask(ip_with_cidr: str):
     """
@@ -301,25 +368,26 @@ def get_host_ip_mask(ip_with_cidr: str):
     network = ipaddress.ip_network(ip_with_cidr, strict=False)
     return f'{network.network_address}/{cidr}'
 
-def get_network_subnet(interface = get_primary_interface()):
+def get_network_subnet(interface = None):
+    """
+    Get the network subnet for a given interface.
+    Uses network_from_snicaddr for conversion.
+    Default is primary interface.
     """
-    Get the network interface and subnet.
-    Default is primary interface
-    """ 
+    interface = interface or get_primary_interface()
+    
     try:
-        ip_address = get_ip_address(interface)
-        netmask = get_netmask(interface)
-        # is valid interface?
-        if ip_address and netmask:
-            cidr = get_cidr_from_netmask(netmask)
-
-            ip_mask = f'{ip_address}/{cidr}'
-
-            return get_host_ip_mask(ip_mask)
-    except:
+        addrs = psutil.net_if_addrs()
+        if interface in addrs:
+            for snicaddr in addrs[interface]:
+                if snicaddr.family == socket.AF_INET and snicaddr.address and snicaddr.netmask:
+                    subnet = network_from_snicaddr(snicaddr)
+                    if subnet:
+                        return subnet
+    except Exception:
         log.info(f'Unable to parse subnet for interface: {interface}')
         log.debug(traceback.format_exc())
-    return
+    return None
 
 def get_all_network_subnets():
     """
@@ -332,7 +400,9 @@ def get_all_network_subnets():
     for interface, snicaddrs in addrs.items():
         for snicaddr in snicaddrs:
             if snicaddr.family == socket.AF_INET and gateways[interface].isup:
-                subnet = get_network_subnet(interface)
+
+                subnet = network_from_snicaddr(snicaddr)
+
                 if subnet: 
                     subnets.append({ 
                         'subnet': subnet, 
@@ -341,17 +411,70 @@ def get_all_network_subnets():
 
     return subnets
 
-def smart_select_primary_subnet(subnets: List[dict]=get_all_network_subnets()) -> str:
+def network_from_snicaddr(snicaddr: psutil._common.snicaddr) -> str:
     """
-     Finds the largest subnet within max ip range
-     not perfect, but works better than subnets[0]
+    Convert a psutil snicaddr object to a human-readable string.
     """
+    if not snicaddr.address or not snicaddr.netmask:
+        return None
+    elif snicaddr.family == socket.AF_INET:
+        addr = f"{snicaddr.address}/{get_cidr_from_netmask(snicaddr.netmask)}"
+    elif snicaddr.family == socket.AF_INET6:
+        addr = f"{snicaddr.address}/{snicaddr.netmask}"
+    else:
+        return f"{snicaddr.address}"
+    return get_host_ip_mask(addr)
+
+def smart_select_primary_subnet(subnets: List[dict] | None = None) -> str:
+    """
+    Intelligently select the primary subnet that is most likely handling internet traffic.
+    
+    Selection priority:
+    1. Subnet associated with the primary interface (with default gateway)
+    2. Largest subnet within maximum allowed IP range
+    3. First subnet in the list as fallback
+    
+    Returns an empty string if no subnets are available.
+    """
+    subnets = subnets or get_all_network_subnets()
+
+    if not subnets:
+        return ""
+        
+    # First priority: Get subnet for the primary interface
+    primary_if = get_primary_interface()
+    if primary_if:
+        primary_subnet = get_network_subnet(primary_if)
+        if primary_subnet:
+            # Return this subnet if it's within our list
+            for subnet in subnets:
+                if subnet["subnet"] == primary_subnet:
+                    return primary_subnet
+
+    # Second priority: Find a reasonable sized subnet (existing logic)
     selected = {}
     for subnet in subnets:
-        if selected.get('address_cnt',0) < subnet['address_cnt'] < MAX_IPS_ALLOWED:
+        if selected.get("address_cnt", 0) < subnet["address_cnt"] < MAX_IPS_ALLOWED:
             selected = subnet
-    if not selected and len(subnets):
+
+    # Third priority: Just take the first subnet if nothing else matched
+    if not selected and subnets:
         selected = subnets[0]
-    return selected['subnet']
+
+    return selected.get("subnet", "")
+
+def is_arp_supported():
+    """
+    Check if ARP requests are supported on the current platform.
+    """
+    try:
+        arp_request = ARP(pdst='0.0.0.0')
+        broadcast   = Ether(dst="ff:ff:ff:ff:ff:ff")
+        packet      = broadcast / arp_request
+
+        srp(packet, timeout=0, verbose=False)
+        return True
+    except Scapy_Exception:
+        return False
 
 

lanscape/libraries/runtime_args.py

@@ -10,6 +10,7 @@ class RuntimeArgs:
     logfile: bool = False
     loglevel: str = 'INFO'
     flask_logging: bool = False
+    persistent: bool = False
 
 def parse_args() -> RuntimeArgs:
     parser = argparse.ArgumentParser(description='LANscape')
@@ -19,6 +20,7 @@ def parse_args() -> RuntimeArgs:
     parser.add_argument('--logfile', action='store_true', help='Log output to lanscape.log')
     parser.add_argument('--loglevel', default='INFO', help='Set the log level')
     parser.add_argument('--flask-logging', action='store_true', help='Enable flask logging (disables click output)')
+    parser.add_argument('--persistent', action='store_true', help='Don\'t exit after browser is closed')
 
     # Parse the arguments
     args = parser.parse_args()

lanscape/libraries/subnet_scan.py

@@ -12,7 +12,7 @@ from tabulate import tabulate
 from dataclasses import dataclass
 from concurrent.futures import ThreadPoolExecutor, as_completed
 
-from .net_tools import Device
+from .net_tools import Device, is_arp_supported
 from .ip_parser import parse_ip_input
 from .port_manager import PortManager
 from.errors import SubnetScanTerminationFailure
@@ -80,6 +80,8 @@ class SubnetScanner:
         self.uid = str(uuid.uuid4())
         self.results = ScannerResults(self)
         self.log: logging.Logger = logging.getLogger('SubnetScanner')
+        if not is_arp_supported():
+            self.log.warning('ARP is not supported with the active runtime context. Device discovery will be limited to ping responses.')
         self.log.debug(f'Instantiated with uid: {self.uid}')
         self.log.debug(f'Port Count: {len(self.ports)} | Device Count: {len(self.subnet)}')
 

lanscape/libraries/version_manager.py

@@ -33,7 +33,7 @@ def lookup_latest_version(package=PACKAGE):
         no_cache = f'?cachebust={randint(0,6969)}'
         url = f"https://pypi.org/pypi/{package}/json{no_cache}"
         try:
-            response = requests.get(url)
+            response = requests.get(url,timeout=5)
             response.raise_for_status()  # Raise an exception for HTTP errors
             latest = response.json()['info']['version']
             log.debug(f'Latest pypi version: {latest}')

lanscape/libraries/web_browser.py

@@ -14,7 +14,7 @@ import webbrowser
 import logging
 import re
 import time
-import traceback
+from typing import Optional
 from ..ui.app import app
 
 log = logging.getLogger('WebBrowser')
@@ -34,7 +34,8 @@ def open_webapp(url: str) -> bool:
             raise RuntimeError('Unable to find browser binary')
         log.debug(f'Opening {url} with {exe}')
 
-        subprocess.run(f'{exe} --app="{url}"')
+        cmd = f'"{exe}" --app="{url}"'
+        subprocess.run(cmd, check=True, shell=True)
 
         if time.time() - start < 2:
             log.debug(f'Unable to hook into closure of UI, listening for flask shutdown')
@@ -56,7 +57,7 @@ def open_webapp(url: str) -> bool:
     return False
     
 
-def get_default_browser_executable() -> str | None:
+def get_default_browser_executable() -> Optional[str]:
     if sys.platform.startswith("win"):
         try:
             import winreg
@@ -117,8 +118,24 @@ def get_default_browser_executable() -> str | None:
                             # strip arguments like “%u”, “--flag”, etc.
                             exec_cmd = exec_cmd.split()[0]
                             exec_cmd = exec_cmd.split("%")[0]
-                            return exec_cmd
+            return exec_cmd
         return None
 
+    elif 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"
+
     else:
         raise NotImplementedError(f"Unsupported platform: {sys.platform!r}")

lanscape/tests/test_api.py

@@ -90,7 +90,6 @@ class ApiTestCase(unittest.TestCase):
         ]
         for uri in uris:
             response = self.app.get(uri)
-            print(uri, response.status_code)
             self.assertEqual(response.status_code,200)
 
 

lanscape/tests/test_env.py

@@ -2,6 +2,7 @@ import unittest
 
 from ..libraries.version_manager import lookup_latest_version 
 from ..libraries.app_scope import ResourceManager, is_local_run
+from ..libraries.net_tools import is_arp_supported
 
 
 
@@ -20,5 +21,10 @@ class EnvTestCase(unittest.TestCase):
     def test_local_version(self):
         self.assertTrue(is_local_run())
         
+    def test_arp_support(self):
+        arp_supported = is_arp_supported()
+        self.assertIn(arp_supported, [True, False],
+            f"ARP support should be either True or False, not {arp_supported}"
+        )
         
 

lanscape/ui/app.py

@@ -1,4 +1,4 @@
-from flask import Flask, render_template
+from flask import Flask, render_template, request
 from time import sleep
 import multiprocessing
 import traceback
@@ -9,6 +9,7 @@ import os
 from ..libraries.runtime_args import RuntimeArgs, parse_args
 from ..libraries.version_manager import is_update_available, get_installed_version, lookup_latest_version
 from ..libraries.app_scope import is_local_run
+from ..libraries.net_tools import is_arp_supported
 
 app = Flask(
     __name__
@@ -57,16 +58,28 @@ set_global_safe('update_available', is_update_available)
 set_global_safe('latest_version',lookup_latest_version)
 set_global_safe('runtime_args', vars(parse_args()))
 set_global_safe('is_local',is_local_run)
+set_global_safe('is_arp_supported', is_arp_supported)
 
 ## External hook to kill flask server
 ################################
 
 exiting = False
-@app.route("/shutdown")
+@app.route("/shutdown", methods=['GET', 'POST'])
 def exit_app():
+    
+    req_type = request.args.get('type')
+    if req_type == 'browser-close':
+        args = parse_args()
+        if args.persistent:
+            log.info('Dectected browser close, not exiting flask.')
+            return "Ignored"
+        log.info('Web browser closed, terminating flask. (disable with --peristent)')
+    elif req_type == 'core':
+        log.info('Core requested exit, terminating flask.')
+    else:
+        log.info('Received external exit request. Terminating flask.')
     global exiting
     exiting = True
-    log.info('Received external exit request. Terminating flask.')
     return "Done"
 
 @app.teardown_request
@@ -89,7 +102,7 @@ def internal_error(e):
 ## Webserver creation functions
 ################################
 
-def start_webserver_dameon(args: RuntimeArgs) -> threading.Thread:
+def start_webserver_daemon(args: RuntimeArgs) -> threading.Thread:
     proc = threading.Thread(target=start_webserver, args=(args,))
     proc.daemon = True # Kill thread when main thread exits
     proc.start()

lanscape/ui/main.py

@@ -7,12 +7,13 @@ import os
 from ..libraries.logger import configure_logging
 from ..libraries.runtime_args import parse_args, RuntimeArgs
 from ..libraries.web_browser import open_webapp
+from ..libraries.net_tools import is_arp_supported
 # do this so any logs generated on import are displayed
 args = parse_args()
 configure_logging(args.loglevel, args.logfile, args.flask_logging)
 
 from ..libraries.version_manager import get_installed_version, is_update_available
-from .app import start_webserver_dameon, start_webserver
+from .app import start_webserver_daemon, start_webserver
 import socket
 
 
@@ -43,8 +44,10 @@ def _main():
         log.info('Flask reloaded app.')
         
     args.port = get_valid_port(args.port)
-        
-        
+
+    if not is_arp_supported():
+        log.warning('ARP is not supported, device discovery is degraded. For more information, see the help guide: https://github.com/mdennis281/LANscape/blob/main/support/arp-issues.md')
+
     try:
         start_webserver_ui(args)
         log.info('Exiting...')
@@ -100,13 +103,13 @@ def start_webserver_ui(args: RuntimeArgs):
             ).start()
         start_webserver(args)
     else: 
-        flask_thread = start_webserver_dameon(args)
+        flask_thread = start_webserver_daemon(args)
         app_closed = open_browser(uri)
 
         # 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:
+        if not app_closed or args.persistent:
             # not doing a direct join so i can still 
             # terminate the app with ctrl+c
             while flask_thread.is_alive():
@@ -126,7 +129,7 @@ def get_valid_port(port: int):
 def terminate():
     import requests
     log.info('Attempting flask shutdown')
-    requests.get(f'http://127.0.0.1:{args.port}/shutdown')
+    requests.get(f'http://127.0.0.1:{args.port}/shutdown?type=core')
 
 
 

lanscape/ui/static/css/style.css

@@ -11,6 +11,8 @@
     --danger-accent: #ff5252; /* Bright red for warnings */
     --danger-accent-hover: #e64545;
 
+    --danger-accent-transparent: rgba(255, 82, 82, 0.3);/* Light red for subtle danger indication */
+
     --warning-accent: #cc8801; /* Vibrant amber for warnings */
     --warning-accent-hover: #d08802;
 
@@ -54,8 +56,9 @@ body:has(.submodule) footer {
     background-color: var(--primary-bg);
     border-radius: 8px;
     box-shadow: 0 0 10px var(--box-shadow);
-    width: 90%;
+    width: 95%;
     margin-top: 10px;
+    overflow: hidden; 
 }
 
 #header {
@@ -255,18 +258,7 @@ details {
 
 
 
-@media screen and (max-width: 681px) {
-    #power-button {
-        left: auto;
-        right: 0;
-        border-width: 0 0 1px 1px;
-        border-radius: 0 0 0 5px;
-    }
-    .container-fluid {
-        width:98%;
-        padding: 8px;
-    }
-}
+
 
 /* Card Styles */
 .card {
@@ -692,7 +684,36 @@ html {
     background-color: var(--warning-accent);
 }
 
-/* width of iFrame, not page */
+#arp-error {
+    width: calc(100% + 40px);
+    position: relative;
+    display: flex;
+    justify-content: center;
+    background-color: var(--danger-accent-transparent);
+    color: var(--text-color);
+    transform: translate3d(-20px, -20px, 0);
+    font-size: small;
+}
+#arp-error span {
+    text-align: center;
+}
+
+@media screen and (max-width: 681px) {
+    #power-button {
+        left: auto;
+        right: 0;
+        border-width: 0 0 1px 1px;
+        border-radius: 0 0 0 5px;
+    }
+    .container-fluid {
+        width:98%;
+        padding: 8px;
+    }
+    #arp-error {
+        width: calc(100% + 16px);
+        transform: translate3d(-8px, -8px, 0);
+    }
+}
 
 @media screen and (max-width: 885px) {
     #overview-container .col-4 {

lanscape/ui/static/js/on-tab-close.js

@@ -0,0 +1,42 @@
+// helps flask server know when the browser tab is closed
+
+
+function sendOnUnload(event = null) {
+    const url = '/shutdown?type=browser-close';
+    const data = JSON.stringify({ event });
+    console.log('sendOnUnload called:', data);
+    // (1) Using navigator.sendBeacon
+    if (navigator.sendBeacon) {
+        const blob = new Blob([data], { type: 'application/json' });
+        navigator.sendBeacon(url, blob);
+    }
+    // (2) Or—you can use fetch with keepalive (supported in modern browsers)
+    else {
+        fetch(url, {
+            method: 'POST',
+            body: data,
+            headers: { 'Content-Type': 'application/json' },
+            keepalive: true
+        })
+        .catch((err) => {
+            // If it fails, there's not much you can do here.
+            console.warn('sendOnUnload fetch failed:', err);
+        });
+    }
+}
+
+let hasBeenCalled = false;
+
+// When pagehide is called w/ persist=false we want to send our payload.
+// Wont work on all browsers, but should work on most modern ones.
+window.addEventListener('pagehide', (event) => {
+    if (!hasBeenCalled && !event.persisted) {
+        // persisted = false means page is being discarded, not cached
+        const clonedEvent = { 
+            type: 'pagehide',
+            persisted: event.persisted
+        };
+        sendOnUnload(clonedEvent);
+        hasBeenCalled = true;
+    }
+});

lanscape/ui/templates/core/scripts.html

@@ -3,3 +3,7 @@
 <script src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.9.2/dist/umd/popper.min.js"></script>
 <script src="{{ url_for('static', filename='js/core.js') }}"></script>
+
+{% if section is not defined %}
+<script src="{{ url_for('static', filename='js/on-tab-close.js') }}"></script>
+{% endif %}

lanscape/ui/templates/info.html

@@ -4,9 +4,11 @@
 <div id="header">
       <!-- Header and Scan Submission Inline -->
     <div class="d-flex justify-content-start align-items-center">
-        <h1 class="title" onclick="location.href = '/'">
-            <span>LAN</span>scape 
-        </h1>
+        <a href="/" class="text-decoration-none" aria-label="Go to homepage">
+            <h1 class="title">
+                <span>LAN</span>scape 
+            </h1>
+        </a>
     </div>
 </div>
 <div class="scroll-container" id="content">
@@ -18,7 +20,7 @@
             ({{app_version}} -> {{latest_version}})
         </p>
         <input type="text" readonly class="form-control mb-3 mt-3" value="pip install --upgrade lanscape --no-cache"/>
-        <a  href="https://pypi.org/project/lanscape/" target="_blank"></a>
+        <a class="text-decoration-none" href="https://pypi.org/project/lanscape/" target="_blank">
             <button class="btn btn-primary m-2">PyPi - Lanscape</button>
         </a>
     </div>  
@@ -33,10 +35,10 @@
             This project has been a learning journey, & I hope it helps you 
             discover more about your network as well. Enjoy!
         </p>
-        <a  href="https://github.com/mdennis281/" target="_blank"></a>
-            <button class="btn btn-primary m-2">Github</button>
+        <a  href="https://github.com/mdennis281/" class="text-decoration-none" target="_blank">
+            <button class="btn btn-primary m-2">GitHub</button>
         </a>
-        <a  href="https://github.com/mdennis281/LANscape" target="_blank">
+        <a  href="https://github.com/mdennis281/LANscape" class="text-decoration-none" target="_blank">
             <button class="btn btn-secondary m-2">Project Repo</button>
         </a>
     </div>  

lanscape/ui/templates/main.html

@@ -49,6 +49,13 @@
 </div>
 <div id="content">
     <div class="container-fluid my-4">
+        <!-- ARP Error -->
+        <div id="arp-error" class="{{ 'div-hide' if is_arp_supported else '' }}">
+            <span>
+                Unable to use ARP lookup. Device discovery is degraded.
+                <a target="_blank" href="https://github.com/mdennis281/LANscape/blob/main/support/arp-issues.md">Steps to fix</a>
+            </span>
+        </div>
         <!-- Scan Results -->
         <div id="scan-results" class="div-hide">
             <div class="d-flex justify-content-between">

{lanscape-1.3.0a6.dist-info → lanscape-1.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 1.3.0a6
+Version: 1.3.1
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 Project-URL: Homepage, https://github.com/mdennis281/py-lanscape
@@ -14,7 +14,7 @@ License-File: LICENSE
 Requires-Dist: Flask<5.0,>=3.0
 Requires-Dist: psutil<7.0,>=6.0
 Requires-Dist: requests<3.0,>=2.32
-Requires-Dist: Setuptools<81
+Requires-Dist: setuptools
 Requires-Dist: scapy<3.0,>=2.3.2
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: pytest
@@ -32,7 +32,8 @@ python -m lanscape
 ```
 
 ## Flags
- - `--port <port number>` port of the flask app (default: 5001)
+ - `--port <port number>` port of the flask app (default: automagic)
+ - `--persistent` dont shutdown server when browser tab is closed (default: false)
  - `--reloader` essentially flask debug mode- good for local development (default: false)
  - `--logfile` save log output to lanscape.log
  - `--loglevel <level>` set the logger's log level (default: INFO)
@@ -55,6 +56,14 @@ can sometimes require admin-level permissions to retrieve accurate results.
 ### Message "WARNING: No libpcap provider available ! pcap won't be used"
 This is a missing dependency related to the ARP lookup. This is handled in the code, but you would get marginally faster/better results with this installed: [npcap download](https://npcap.com/#download)
 
+### The accuracy of the devices found is low
+I use a combination of ARP and Ping to determine if a device is online. This method drops in stability when used in many threads. 
+Recommendations:
+
+  - Drop parallelism value (advanced dropdown)
+  - Use python > 3.10 im noticing threadpool improvements after this version
+  - Create a bug - I'm curious
+
 
 ### Something else
 Feel free to submit a github issue detailing your experience.

{lanscape-1.3.0a6.dist-info → lanscape-1.3.1.dist-info}/RECORD

@@ -6,13 +6,13 @@ lanscape/libraries/errors.py,sha256=DaercNEZD_tUuXF7KsNk3SD6AqAwT-S7fvzpEybVn08,
 lanscape/libraries/ip_parser.py,sha256=ElXz3LU5CUYWqKOHEyrj5Y4Iv6OBtoSlbCcxhCsibfQ,2226
 lanscape/libraries/logger.py,sha256=doD8KKb4TNWDwVXc1VR7NK4UdharrAoRHl8vZnSAupI,1407
 lanscape/libraries/mac_lookup.py,sha256=-dRV0ygtjjh3JkgL3GTi_5-w7pcZ1oj4XVH4chjsmRs,2121
-lanscape/libraries/net_tools.py,sha256=boiccYtpv3v37l239b9jQvYUBgz_ynm0W149ceVCSBU,11473
+lanscape/libraries/net_tools.py,sha256=dUGPwiOudr6I3flMrTyUumpve4pJrt_lST3l8fOOFxs,17117
 lanscape/libraries/port_manager.py,sha256=fNext3FNfGnGYRZK9RhTEwQ2K0e0YmmMlhK4zVAvoCw,1977
-lanscape/libraries/runtime_args.py,sha256=zL8QB_Y69OBGjScytuuyHqdy2XimwpypMSPM3_etz7g,1811
+lanscape/libraries/runtime_args.py,sha256=ICX_JkOmqDQdewZNfRxJb9jMggDw1XqF5CxM9zXZE_Q,1947
 lanscape/libraries/service_scan.py,sha256=jLU84ZoJnqSQbE30Zly2lm2zHrCGutNXjla1sEvp1hE,1949
-lanscape/libraries/subnet_scan.py,sha256=0LW_xdoL-PRp59rJr6r6pSL3LiXEO_SJnjdrgEF_pO8,13120
-lanscape/libraries/version_manager.py,sha256=v-IsZ7sYIsNRiraIRckGZthlyL0iTuscR6jF_o9LBK8,1720
-lanscape/libraries/web_browser.py,sha256=mMc_48g2_GZ0FdHOUuy63pBgYKIdmEz16WtYd0pzhIM,4324
+lanscape/libraries/subnet_scan.py,sha256=nT1-P9UkIneRcgfPNwZveiYYB4T-qnS6fv21tYRhCGQ,13313
+lanscape/libraries/version_manager.py,sha256=3n0PV_EdW9Fgg2yxD2uzA4WYvzk6H6hMf_1gfvtZbp0,1730
+lanscape/libraries/web_browser.py,sha256=EuKJG3bmBZUochDGm9a0qrB6JkIkOkvx4njZBe4eLIQ,5028
 lanscape/resources/mac_addresses/convert_csv.py,sha256=w3Heed5z2mHYDEZNBep3_hNg4dbrp_N6J54MGxnrq4s,721
 lanscape/resources/mac_addresses/mac_db.json,sha256=ygtFSwNwJzDlg6hmAujdgCyzUjxt9Di75J8SO4xYIs8,2187804
 lanscape/resources/ports/convert_csv.py,sha256=mWe8zucWVfnlNEx_ZzH5Vc3tJJbdi-Ih4nm2yKNrRN0,720
@@ -23,11 +23,11 @@ lanscape/resources/ports/small.json,sha256=Mj3zGVG1F2eqZx2YkrLpTL8STeLcqB8_65IR6
 lanscape/resources/services/definitions.jsonc,sha256=71w9Q7r4RoBYiIMkzzO2KdEJXaSIchNccYQueqAhD4E,8842
 lanscape/tests/__init__.py,sha256=xYPeceOF-ppTS0wnq7CkVYQMwupmeSHxbYLbGj_imZ0,113
 lanscape/tests/_helpers.py,sha256=wXJfUwzL3Fq4XBsC3dValCbXsf0U8FisuM_yo1de4QQ,371
-lanscape/tests/test_api.py,sha256=881eHwSHT5GnOB61zbt3BRzCZnSwN2lndwCM5kIHLgo,7359
-lanscape/tests/test_env.py,sha256=ivFhCcemJ9vbe0_KtUkbqDY4r9nsDB8rVLUVjV-sNj8,673
+lanscape/tests/test_api.py,sha256=sjcjt3b1ZwvQiALOSfXoQxTlN1Z1_TRPC0EEy-bRIgE,7313
+lanscape/tests/test_env.py,sha256=7gfekAAfzlQxHmYG3MwDQpABDDkRomKWBhmIHFPq0jw,946
 lanscape/tests/test_library.py,sha256=OPcTsUoR5IureSNDbePxid2BG98mfNNIJmCIY0BVz3w,1553
-lanscape/ui/app.py,sha256=Efa9gJnAcA_a3taCne9EHU4YxTCoRDd1M6UGa3rb2Qw,3126
-lanscape/ui/main.py,sha256=zDs7epDeXRoxZAHt9aLXB3kypXdZa1pSeqCIitwN7Ig,3998
+lanscape/ui/app.py,sha256=WfoWmNMkt9_58Dn8rX4vs59rchQ8E2d_6vGOvaINYbg,3701
+lanscape/ui/main.py,sha256=oc43T1zS00v1QmS0yI4M1-FmLLW5vtrsWJ9CA4DAeBw,4284
 lanscape/ui/blueprints/__init__.py,sha256=agvgPOSVbrxddaw6EY64ZZr1CQi1Qzwcs1t0lZMv5oY,206
 lanscape/ui/blueprints/api/__init__.py,sha256=t0QOq3vHFWmlZm_3YFPQbQzCn1a_a5cmRchtIxwy4eY,103
 lanscape/ui/blueprints/api/port.py,sha256=2UA38umzXE8pMitx1E-_wJHyL1dYYbtM6Kg5zVtfj6A,1019
@@ -36,7 +36,7 @@ lanscape/ui/blueprints/api/tools.py,sha256=CD0NDSX8kN6_lpl0jEw-ULLsDx7pKODCMFQia
 lanscape/ui/blueprints/web/__init__.py,sha256=-WRjENG8D99NfaiSDk9uAa8OX6XJq9Zmq1ck29ARL-w,92
 lanscape/ui/blueprints/web/routes.py,sha256=hl89T5_oRbTlA9Cde_xh9zAQDGRRH-Dpwm74B1_NM1Y,2511
 lanscape/ui/static/lanscape.webmanifest,sha256=0aauJk_Bybd0B2iwzJfvPcs7AX43kVHs0dtpV6_jSWk,459
-lanscape/ui/static/css/style.css,sha256=ZoROzQmBIZlMdz0i9YHkx0Eomo87nQcDLJnGiiC0S3Y,15838
+lanscape/ui/static/css/style.css,sha256=lu9078sZKrMBmT_tM6084_DDnEEMXVMziO6E-gVYkhk,16372
 lanscape/ui/static/img/ico/android-chrome-192x192.png,sha256=JmFT6KBCCuoyxMV-mLNtF9_QJbVBvfWPUizKN700fi8,18255
 lanscape/ui/static/img/ico/android-chrome-512x512.png,sha256=88Jjx_1-4XAnZYz64KP6FdTl_kYkNG2_kQIKteQwSh4,138055
 lanscape/ui/static/img/ico/apple-touch-icon.png,sha256=tEJlLwBZtF4v-NC90YCfRJQ2prTsF4i3VQLK_hnv2Mw,16523
@@ -47,25 +47,26 @@ lanscape/ui/static/img/ico/site.webmanifest,sha256=ep4Hzh9zhmiZF2At3Fp1dQrYQuYF_
 lanscape/ui/static/js/core.js,sha256=y-f8iQPIetllUY0lSCwnGbPCk5fTJbbU6Pxm3rw1EBU,1111
 lanscape/ui/static/js/layout-sizing.js,sha256=23UuKdEmRChg6fyqj3DRvcsNfMoa6MRt6dkaT0k7_UY,841
 lanscape/ui/static/js/main.js,sha256=s0ipGqmuuFHnH9KKoUVaDRJ10_YqYoJ-9r_YnbsH8Mw,7676
+lanscape/ui/static/js/on-tab-close.js,sha256=YYzNd1KMrLWW4-rFcC8EXckTRfG-pKRLA6xpdVTDt04,1417
 lanscape/ui/static/js/quietReload.js,sha256=_mHzpUsGL4Lm1hNsr3VYSOGVcgGA2y1-eZHacssTXGs,724
 lanscape/ui/static/js/shutdown-server.js,sha256=WkO7_SNSHM_6kReUoCoExIdCf7Sl7IPiSiNxpbI-r0s,469
 lanscape/ui/static/js/subnet-info.js,sha256=aytt0LkBx4FVq36TxiMEw3aM7XQLHg_ng1U2WDwZVF4,577
 lanscape/ui/static/js/subnet-selector.js,sha256=OG01pDaSOPLq3Ial0aO0CqPcob9tPZA1MZKGmQG0W7Q,366
 lanscape/ui/templates/base.html,sha256=P5xnMlvDXYkYSXdSZUWaRfhsszNuZPP7A56hemBrAFs,1498
 lanscape/ui/templates/error.html,sha256=zXFO0zPIfQORWq1ZMiSZ8G7FjfhVVr-aaYC0HeBl4Rs,1068
-lanscape/ui/templates/info.html,sha256=oCC59keGEfgUB4WaCozaeZEfNb8Nr7y61DmkRBMqs18,2461
-lanscape/ui/templates/main.html,sha256=M12xJSN6Ga565vIPhdCiqcr1tYgDrqzuQTeuXtk-8yo,3759
+lanscape/ui/templates/info.html,sha256=1ISKdR0dWoGscS--cY_h65UCdL4ldYd8B4-4k6S3QqI,2614
+lanscape/ui/templates/main.html,sha256=J24jdTYUXoXiqDVAiK8wQeHfznH0l98Z2NAU-KJlSPM,4131
 lanscape/ui/templates/scan.html,sha256=Fz1Q4CzRq5qpKgszTAQLhaLVV0A6gBraT33mNDmpYRE,390
 lanscape/ui/templates/shutdown.html,sha256=v0cGT5CJWi-V8b5sUN3l-QIDNUmHTvKGi2gDlhmRlrs,724
 lanscape/ui/templates/core/head.html,sha256=6XyoDIz-IMPIRG-ti2LFY9FFX39UTIf_K6-6USni_ek,788
-lanscape/ui/templates/core/scripts.html,sha256=TRW74VUDasOTFYkaDhKKFnEwHyNx-_rmzSm5nE4n_ys,521
+lanscape/ui/templates/core/scripts.html,sha256=l9qoODOD9VDKMk2-4lsD_gwscHPXgwuDw-SkQXfXylo,649
 lanscape/ui/templates/scan/export.html,sha256=Qi0m2xJPbC5I2rxzekXjvQ6q9gm2Lr4VJW6riLhIaU0,776
 lanscape/ui/templates/scan/ip-table-row.html,sha256=ptY24rxJRaA4PEEQRDncaq6Q0ql5RJ87Kn0zKRCzOHw,4842
 lanscape/ui/templates/scan/ip-table.html,sha256=ds__UP9JiTKf5IxCmTMzw--eN_yg1Pvn3Nj1KvQxeZg,940
 lanscape/ui/templates/scan/overview.html,sha256=FsX-jSFhGKwCxZGKE8AMKk328UuawN6O9RNTzYvIOts,1205
 lanscape/ui/templates/scan/scan-error.html,sha256=Q4eZM5ThrxnFaWOSTUpK8hA2ksHwhxOBTaVUCLALhyA,1032
-lanscape-1.3.0a6.dist-info/licenses/LICENSE,sha256=cCO-NbS01Ilwc6djHjZ7LIgPFRkRmWdr0fH2ysXKioA,1090
-lanscape-1.3.0a6.dist-info/METADATA,sha256=HhwZRp7f-0IwPDHginCcuPUqp5TsdPHJgecFcF4jUN0,2123
-lanscape-1.3.0a6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lanscape-1.3.0a6.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
-lanscape-1.3.0a6.dist-info/RECORD,,
+lanscape-1.3.1.dist-info/licenses/LICENSE,sha256=cCO-NbS01Ilwc6djHjZ7LIgPFRkRmWdr0fH2ysXKioA,1090
+lanscape-1.3.1.dist-info/METADATA,sha256=fLPrPvQi__d3QVtRbVeULJdHxnJWQbdt_LKjKoVJV-w,2565
+lanscape-1.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lanscape-1.3.1.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
+lanscape-1.3.1.dist-info/RECORD,,