lanscape 1.3.8a1__py3-none-any.whl → 2.4.0a2__py3-none-any.whl

lanscape/ui/app.py

@@ -8,12 +8,12 @@ import logging
 from flask import Flask, render_template
 from lanscape.ui.blueprints.web import web_bp, routes  # pylint: disable=unused-import
 from lanscape.ui.blueprints.api import api_bp, tools, port, scan  # pylint: disable=unused-import
-from lanscape.libraries.runtime_args import RuntimeArgs, parse_args
-from lanscape.libraries.version_manager import (
+from lanscape.core.runtime_args import RuntimeArgs, parse_args
+from lanscape.core.version_manager import (
     is_update_available, get_installed_version, lookup_latest_version
 )
-from lanscape.libraries.app_scope import is_local_run
-from lanscape.libraries.net_tools import is_arp_supported
+from lanscape.core.app_scope import is_local_run
+from lanscape.core.net_tools import is_arp_supported
 from lanscape.ui.shutdown_handler import FlaskShutdownHandler
 
 app = Flask(
@@ -51,6 +51,18 @@ app.jinja_env.filters['is_substring_in_values'] = is_substring_in_values
 ################################
 
 
+def get_runtime_args_safe():
+    """
+    Safely get runtime args, returning empty dict if parsing fails.
+    This prevents conflicts when the module is imported during testing.
+    """
+    try:
+        return vars(parse_args())
+    except SystemExit:
+        # This happens when pytest tries to import the module
+        return {}
+
+
 def set_global_safe(key: str, value):
     """ Safely set global vars without worrying about an exception """
     app_globals = app.jinja_env.globals
@@ -73,7 +85,7 @@ def set_global_safe(key: str, value):
 set_global_safe('app_version', get_installed_version)
 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('runtime_args', get_runtime_args_safe)
 set_global_safe('is_local', is_local_run)
 set_global_safe('is_arp_supported', is_arp_supported)
 

lanscape/ui/blueprints/__init__.py

@@ -1,7 +1,7 @@
 """Source for all things blueprint related in LANscape UI"""
 import logging
 
-from lanscape.libraries.subnet_scan import ScanManager
+from lanscape.core.subnet_scan import ScanManager
 
 # defining here so blueprints can access the same
 # manager instance

lanscape/ui/blueprints/api/port.py

@@ -4,7 +4,7 @@ Provides CRUD operations for managing port lists used in network scans.
 """
 from flask import request, jsonify
 from lanscape.ui.blueprints.api import api_bp
-from lanscape.libraries.port_manager import PortManager
+from lanscape.core.port_manager import PortManager
 
 # Port Manager API
 ############################################
@@ -21,6 +21,20 @@ def get_port_lists():
     return jsonify(PortManager().get_port_lists())
 
 
+@api_bp.route('/api/port/list/summary', methods=['GET'])
+def get_port_lists_summary():
+    """Get port list names with their port counts."""
+    manager = PortManager()
+    summaries = []
+    for name in manager.get_port_lists():
+        ports = manager.get_port_list(name) or {}
+        summaries.append({
+            'name': name,
+            'count': len(ports)
+        })
+    return jsonify(summaries)
+
+
 @api_bp.route('/api/port/list/<port_list>', methods=['GET'])
 def get_port_list(port_list):
     """

lanscape/ui/blueprints/api/scan.py

@@ -9,7 +9,7 @@ import traceback
 from flask import request, jsonify
 
 from lanscape.ui.blueprints.api import api_bp
-from lanscape.libraries.subnet_scan import ScanConfig
+from lanscape.core.subnet_scan import ScanConfig
 from lanscape.ui.blueprints import scan_manager
 
 # Subnet Scanner API

lanscape/ui/blueprints/api/tools.py

@@ -5,10 +5,10 @@ API endpoints for subnet testing and listing.
 import traceback
 from flask import request, jsonify
 from lanscape.ui.blueprints.api import api_bp
-from lanscape.libraries.net_tools import get_all_network_subnets, is_arp_supported
-from lanscape.libraries.ip_parser import parse_ip_input
-from lanscape.libraries.errors import SubnetTooLargeError
-from lanscape.libraries.scan_config import DEFAULT_CONFIGS
+from lanscape.core.net_tools import get_all_network_subnets, is_arp_supported
+from lanscape.core.ip_parser import parse_ip_input
+from lanscape.core.errors import SubnetTooLargeError
+from lanscape.core.scan_config import DEFAULT_CONFIGS
 
 
 @api_bp.route('/api/tools/subnet/test')

lanscape/ui/blueprints/web/routes.py

@@ -2,9 +2,9 @@
 Web blueprint routes for the LANscape application.
 Handles UI views including the main dashboard, scan results, error display, and exports.
 """
-from flask import render_template, request, redirect
+from flask import render_template, request, redirect, url_for
 from lanscape.ui.blueprints.web import web_bp
-from lanscape.libraries.net_tools import (
+from lanscape.core.net_tools import (
     get_all_network_subnets,
     smart_select_primary_subnet
 )
@@ -81,6 +81,33 @@ def view_errors(scan_id):
     return redirect('/')
 
 
+@web_bp.route('/device/<scan_id>/<device_ip>')
+def view_device(scan_id, device_ip):
+    """
+    Display detailed information about a specific device from a scan.
+
+    Args:
+        scan_id: Unique identifier for the scan
+        device_ip: IP address of the device to view
+
+    Returns:
+        Rendered device detail template or redirect to home if scan not found
+    """
+    if scanner := scan_manager.get_scan(scan_id):
+        devices = scanner.results.devices
+        device_info = next(
+            (device for device in devices if getattr(
+                device, 'ip', None) == device_ip), None)
+
+        if device_info:
+            return render_template('scan/device-detail.html', device=device_info, scan_id=scan_id)
+
+        log.debug(f'Device {device_ip} not found in scan {scan_id}')
+        return redirect(url_for('render_scan', scan_id=scan_id))
+    log.debug(f'Redirecting, scan {scan_id} doesnt exist in memory')
+    return redirect('/')
+
+
 @web_bp.route('/export/<scan_id>')
 def export_scan(scan_id):
     """

lanscape/ui/main.py

@@ -1,19 +1,22 @@
 """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 lanscape.libraries.logger import configure_logging
-from lanscape.libraries.runtime_args import parse_args
-from lanscape.libraries.web_browser import open_webapp
-from lanscape.libraries.version_manager import get_installed_version, is_update_available
+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.version_manager import get_installed_version, is_update_available
 from lanscape.ui.app import start_webserver_daemon, start_webserver
+from lanscape.ui.ws.server import run_server
 # do this so any logs generated on import are displayed
 args = parse_args()
 configure_logging(args.loglevel, args.logfile, args.flask_logging)
@@ -46,6 +49,11 @@ def _main():
     else:
         log.info('Flask reloaded app.')
 
+    # Check if WebSocket server mode is requested
+    if args.ws_server:
+        start_websocket_server()
+        return
+
     args.port = get_valid_port(args.port)
 
     try:
@@ -70,7 +78,23 @@ def try_check_update():
         log.warning('Unable to check for updates.')
 
 
-def open_browser(url: str, wait=2) -> bool:
+def start_websocket_server():
+    """Start the WebSocket server."""
+    args.ws_port = get_valid_port(args.ws_port)
+    log.info(f'Starting WebSocket server on port {args.ws_port}')
+    log.info(f'React UI should connect to ws://localhost:{args.ws_port}')
+    
+    try:
+        run_server(host='0.0.0.0', port=args.ws_port)
+    except KeyboardInterrupt:
+        log.info('WebSocket server stopped by user')
+    except Exception as e:
+        log.critical(f'WebSocket server failed: {e}')
+        log.debug(traceback.format_exc())
+        raise
+
+
+def open_browser(url: str, wait=2) -> Popen | None:
     """
     Open a browser window to the specified
     url after waiting for the server to start
@@ -78,12 +102,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 +127,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/ui/shutdown_handler.py

@@ -5,10 +5,10 @@ import os
 from flask import request
 
 
-from lanscape.libraries.runtime_args import parse_args
+from lanscape.core.runtime_args import parse_args
 
 
-log = logging.getLogger('shutdown_handler')
+log = logging.getLogger('ShutdownHandler')
 
 
 class FlaskShutdownHandler:

lanscape/ui/static/css/style.css

@@ -34,6 +34,9 @@
     --danger-border-color: #922; /* Bold red for danger borders */
     
     --footer-height: 25px;
+
+    --fa-primary-color: var(--text-accent-color);
+    --fa-secondary-color: var(--text-placeholder);
 }
 
 body {
@@ -63,13 +66,16 @@ body:has(.submodule) footer {
 
 #header {
     background-color: var(--primary-bg);
-    padding: 8px 20px;
+    padding: 8px 2%;
     margin: 0;
     display: block;
     position: relative;
     box-shadow: 0 0 10px var(--box-shadow);
     width: 100vw;
 }
+#header .title {
+    font-size: 36px;
+}
 
 footer {
     position: sticky;
@@ -115,6 +121,14 @@ hr {
     border-color: var(--border-color);
     margin: 20px 0;
 }
+
+.config-sections > .config-section {
+    border-top: 1px solid var(--border-color);
+    margin-top: 20px;
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+
 h1.title{
     cursor: pointer;
     margin: 0;
@@ -152,7 +166,12 @@ details {
 
 
 #scan-form {
-    width: 500px;
+    width: 60vw;
+    margin: 0;
+    min-width: 300px;
+    max-width: 700px;
+}
+#scan-form .form-group {
     margin: 0;
 }
 #scan-form label {
@@ -236,7 +255,7 @@ details {
     transition: all .5s ease-in-out
 }
 
-#app-actions a .material-symbols-outlined {
+#app-actions a .fa-solid {
     font-size: inherit
 }
 #app-actions {
@@ -249,9 +268,12 @@ details {
     color: var(--text-color);
     text-decoration: none;
     cursor: pointer;
+    --fa-primary-color: var(--text-accent-color);
+    --fa-secondary-color: var(--text-placeholder);
 }
-#app-actions a:hover {
-    color: var(--text-placeholder)
+#app-actions a i:hover {
+    --fa-primary-color: var(--text-color);
+    --fa-secondary-color: var(--text-accent-color);
 }
 
 #power-button {
@@ -266,10 +288,10 @@ details {
     display: flex;
     justify-content: space-around;
     align-items: center;
-    a {
-        text-decoration: none;
-        margin: 0 3px;
-    }
+}
+
+#scan-actions i {
+    font-size: 20px;
 }
 
 #advanced-modal {
@@ -290,6 +312,9 @@ details {
 }
 #advanced-modal label {
     font-size: 12px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
 }
 #advanced-modal .form-check {
     width: fit-content;
@@ -433,8 +458,10 @@ button {
 
 #scan-form #scan-submit {
     border: none;
-    padding: 10px 20px;
-    margin-top: 15px;
+    padding: 10px 3%;
+    margin: 0 15px;
+    min-width: 55px;
+    height: 42px;
 }
 
 /* Button Styling */
@@ -547,6 +574,41 @@ input[type="range"] {
     color: var(--text-color);
 }
 
+/* Service Strategy Select Styles */
+.service-strategy-wrapper {
+    position: relative;
+    display: block;
+    width: 100%;
+}
+
+.service-strategy {
+    position: relative;
+    background-color: var(--secondary-bg);
+    border: 1px solid var(--border-color);
+    color: var(--text-color);
+    padding: 10px;
+    cursor: pointer;
+    width: 100%;
+    height: 42px;
+    user-select: none;
+    appearance: none;  /* Hide default arrow */
+    transition: all .2s ease-in-out;
+}
+
+.service-strategy:focus {
+    border-color: var(--primary-accent-hover);
+    outline: none;
+}
+
+.service-strategy-wrapper::after {
+    content: '▼';
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    pointer-events: none;
+    color: var(--text-color);
+}
+
 
 
 .text-color {
@@ -604,6 +666,31 @@ input[type="range"] {
     background-color: var(--primary-bg-accent);
 }
 
+.table tbody tr td:has(.info-icon-container),
+.table thead tr th.detail-col
+{
+    width: 30px;
+}
+.table td:has(.info-icon-container) {
+    width: 30px;
+    text-align: center;      /* horizontal center */
+    vertical-align: middle;  /* vertical center inside the cell */
+    padding: 0;              /* optional: remove extra padding */
+}
+.table td .info-icon-container {
+    display: flex;
+    justify-content: center; /* horizontal center */
+    align-items: center;     /* vertical center */
+    height: 100%;            /* ensure it takes full cell height */
+}
+.table td .info-icon-container .info-icon {
+    font-size: 1.2em;
+    color: var(--text-placeholder);
+    cursor: pointer;
+}
+.table td .info-icon:hover {
+    color: var(--text-color);
+}
 
 /* Badge Styles */
 .badge-warning {
@@ -619,7 +706,7 @@ input[type="range"] {
 }
 
 .badge-info {
-    background-color: var(--info-accent);
+    background-color: var(--primary-accent);
 }
 
 .badge-secondary {
@@ -631,6 +718,12 @@ input[type="range"] {
 span.alt {
     color: var(--text-accent-color);
 }
+span.no-wrap {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: block;
+}
 .colorful-buttons a{
     margin:2px;
     color: var(--text-color);
@@ -724,13 +817,7 @@ html {
 }
 
 
-.material-symbols-outlined {
-  font-variation-settings:
-  'FILL' 0,
-  'wght' 400,
-  'GRAD' 0,
-  'opsz' 24
-}
+/* FontAwesome Solid Icon Styling */
 
 #shutdown-sub-sub {
     color: var(--text-almost-hidden);
@@ -827,4 +914,83 @@ html {
     
 }
 
-/* END overview container */
+/* END overview container */
+
+/* Device Modal Styles */
+#device-modal {
+    --bs-modal-width: 750px;
+}
+#device-modal .modal-content {
+    background-color: var(--primary-bg);
+}
+#device-modal h6 {
+    color: var(--primary-accent);
+}
+
+/* Key/Value grid for overview */
+#device-modal .kv-grid {
+    display: grid;
+    grid-template-columns: 180px 1fr;
+    column-gap: 12px;
+    row-gap: 8px;
+    align-items: center;
+}
+#device-modal .kv-label {
+    color: var(--text-placeholder);
+    text-align: right;
+}
+#device-modal .kv-value {
+    color: var(--text-color);
+}
+
+/* Port/service chips */
+#device-modal .chip-group { margin-top: 4px; }
+#device-modal .chip {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    padding: 2px 8px;
+    margin: 2px;
+    font-size: .85rem;
+    background-color: var(--primary-bg-accent);
+    border: 1px solid var(--border-color);
+    border-radius: 999px;
+    color: var(--text-color);
+}
+#device-modal .chip .fa-solid {
+    font-size: 16px;
+}
+
+/* Services layout */
+#device-modal .service-list { width: 100%; }
+#device-modal .service-row {
+    display: flex;
+    align-items: flex-start;
+    gap: 8px;
+    padding: 6px 0;
+    border-bottom: 1px dashed var(--border-color);
+}
+#device-modal .service-row:last-child {
+    border-bottom: none;
+}
+#device-modal .service-name {
+    min-width: 140px;
+    color: var(--text-accent-color);
+    font-weight: 600;
+}
+#device-modal .service-ports { flex: 1; }
+
+/* Errors */
+#device-modal .error-list li {
+    margin-bottom: 4px;
+}
+
+/* Responsive tweaks */
+@media screen and (max-width: 576px) {
+    #device-modal .kv-grid {
+        grid-template-columns: 130px 1fr;
+    }
+    #device-modal .service-name {
+        min-width: 110px;
+    }
+}

lanscape/ui/static/js/core.js

@@ -1,10 +1,12 @@
 $(document).ready(function() {
     rightSizeDocLayout(0,showFooter);
     initTooltips();
+    adjustNoWrap();
 })
 
 $(window).on('resize', function() {
     rightSizeDocLayout();
+    adjustNoWrap();
 });
 
 
@@ -36,4 +38,16 @@ function initTooltips() {
     tooltipTriggerList.map(function (tooltipTriggerEl) {
     return new bootstrap.Tooltip(tooltipTriggerEl)
     })
+}
+
+/*
+    An imperfect approach to adjusting 
+    text field width within a table
+*/
+function adjustNoWrap() {
+    $('.no-wrap').width(0);
+    $('.no-wrap').each(function() {
+        var parentWidth = $(this).parent().width();
+        $(this).width(parseInt(parentWidth));
+    });
 }

lanscape/ui/static/js/main.js

@@ -1,5 +1,3 @@
-
-
 $(document).ready(function() {
     // Load port lists into the dropdown
     const scanId = getActiveScanId();
@@ -217,6 +215,36 @@ $(window).on('resize', function() {
     resizeIframe($('#ip-table-frame')[0]);
 });
 
+function openDeviceDetail(deviceIp) {
+    try {
+        const scanId = getActiveScanId();
+        if (!scanId || !deviceIp) return;
+
+        const safeIp = encodeURIComponent(deviceIp.trim());
+
+        // Remove any existing modal instance to avoid duplicates
+        $('#device-modal').remove();
+
+        $.get(`/device/${scanId}/${safeIp}`, function(html) {
+            // Append modal HTML to the document
+            $('body').append(html);
+
+            // Show the modal
+            const $modal = $('#device-modal');
+            $modal.modal('show');
+
+            // Clean up after closing
+            $modal.on('hidden.bs.modal', function() {
+                $(this).remove();
+            });
+        }).fail(function() {
+            console.error('Failed to load device details');
+        });
+    } catch (e) {
+        console.error('Error opening device detail modal:', e);
+    }
+}
+
 
 
 

lanscape/ui/static/js/quietReload.js

@@ -8,6 +8,9 @@ function quietReload() {
             var newDoc = new DOMParser().parseFromString(data, 'text/html');
             // replace current body with the new body content
             $('body').html($(newDoc.body).html());
+            if (typeof adjustNoWrap === 'function') {
+                adjustNoWrap();
+            }
         });
     }
     setTimeout(function() {