lanscape 2.1.2__tar.gz → 2.4.0a1__tar.gz

{lanscape-2.1.2/lanscape.egg-info → lanscape-2.4.0a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 2.1.2
+Version: 2.4.0a1
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 License-Expression: MIT
@@ -25,11 +25,16 @@ Requires-Dist: scapy<3.0,>=2.3.2
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: pydantic
 Requires-Dist: icmplib
+Requires-Dist: pwa-launcher>=1.1.0
+Requires-Dist: websockets<14.0,>=12.0
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0; extra == "dev"
 Requires-Dist: pytest-cov>=5.0; extra == "dev"
 Requires-Dist: pytest-xdist>=3.0; extra == "dev"
+Requires-Dist: pytest-asyncio>=0.23; extra == "dev"
 Requires-Dist: openai>=1.0.0; extra == "dev"
+Requires-Dist: pylint>=3.0; extra == "dev"
+Requires-Dist: autopep8>=2.0; extra == "dev"
 Dynamic: license-file
 
 # LANscape

{lanscape-2.1.2 → lanscape-2.4.0a1}/lanscape/core/net_tools.py

@@ -98,6 +98,10 @@ class Device(BaseModel):
         if self.alive:
             self.hostname = self._get_hostname()
             self._get_mac_addresses()
+            if not self.manufacturer:
+                self.manufacturer = self._get_manufacturer(
+                    self.get_mac()
+                )
 
     # Fallback for pydantic v1: use dict() and enrich output
     if not _PYD_V2:
@@ -138,18 +142,29 @@ class Device(BaseModel):
         @timeout_enforcer(enforcer_timeout, False)
         def do_test():
             for attempt in range(port_config.retries + 1):
-                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                sock.settimeout(port_config.timeout)
+                sock = None
                 try:
+                    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                    sock.settimeout(port_config.timeout)
                     result = sock.connect_ex((self.ip, port))
                     if result == 0:
                         if port not in self.ports:
                             self.ports.append(port)
                         return True
+                except OSError as e:
+                    # Handle socket creation failures (e.g., "Too many open files")
+                    # Log and continue to retry if attempts remain
+                    log = logging.getLogger('Device.test_port')
+                    log.debug(f"OSError on {self.ip}:{port} attempt {attempt + 1}: {e}")
                 except Exception:
                     pass  # Connection failed, try again if retries remain
                 finally:
-                    sock.close()
+                    # Always close socket if it was created
+                    if sock is not None:
+                        try:
+                            sock.close()
+                        except Exception:
+                            pass  # Ignore errors during cleanup
 
                 # Wait before retry (except on last attempt)
                 if attempt < port_config.retries:

{lanscape-2.1.2 → lanscape-2.4.0a1}/lanscape/core/runtime_args.py

@@ -14,6 +14,8 @@ class RuntimeArgs:
     loglevel: str = 'INFO'
     flask_logging: bool = False
     persistent: bool = False
+    ws_server: bool = False
+    ws_port: int = 8766
 
 
 def parse_args() -> RuntimeArgs:
@@ -35,6 +37,10 @@ def parse_args() -> RuntimeArgs:
                         help='Don\'t exit after browser is closed')
     parser.add_argument('--debug', action='store_true',
                         help='Shorthand debug mode (equivalent to "--loglevel DEBUG --reloader")')
+    parser.add_argument('--ws-server', action='store_true',
+                        help='Start WebSocket server instead of Flask UI')
+    parser.add_argument('--ws-port', type=int, default=8766,
+                        help='Port for WebSocket server (default: 8766)')
 
     # Parse the arguments
     args = parser.parse_args()

{lanscape-2.1.2 → lanscape-2.4.0a1}/lanscape/core/service_scan.py

@@ -154,7 +154,9 @@ def get_port_probes(port: int, strategy: ServiceScanStrategy):
 
 def scan_service(ip: str, port: int, cfg: ServiceScanConfig) -> str:
     """
-    Synchronous function that attempts to identify the service running on a given port.
+    Synchronous function that attempts to identify the service 
+    running on a given port.
+    TODO: This is AI slop and needs to be reworked properly.
     """
 
     async def _async_scan_service(
@@ -183,5 +185,38 @@ def scan_service(ip: str, port: int, cfg: ServiceScanConfig) -> str:
             log.debug(traceback.format_exc())
         return "Unknown"
 
-    # Use asyncio.run to execute the asynchronous logic synchronously
-    return asyncio.run(_async_scan_service(ip, port, cfg=cfg))
+    # Create and properly manage event loop to avoid file descriptor leaks
+    # Using new_event_loop + explicit close is safer in threaded environments
+    # than asyncio.run() which can leave resources open under heavy load
+    loop = None
+    try:
+        try:
+            # Try to get existing loop first (if running in async context)
+            loop = asyncio.get_running_loop()
+            # If we're already in an async context, just await directly
+            return asyncio.run_coroutine_threadsafe(
+                _async_scan_service(ip, port, cfg=cfg), loop
+            ).result(timeout=cfg.timeout + 5)
+        except RuntimeError:
+            # No running loop, create a new one
+            loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(loop)
+            try:
+                return loop.run_until_complete(_async_scan_service(ip, port, cfg=cfg))
+            finally:
+                # Clean up the loop properly
+                try:
+                    # Cancel all remaining tasks
+                    pending = asyncio.all_tasks(loop)
+                    for task in pending:
+                        task.cancel()
+                    # Run loop once more to process cancellations
+                    if pending:
+                        loop.run_until_complete(asyncio.gather(*pending, return_exceptions=True))
+                except Exception:
+                    pass
+                finally:
+                    loop.close()
+    except Exception as e:
+        log.error(f"Event loop error scanning {ip}:{port}: {e}")
+        return "Unknown"

{lanscape-2.1.2 → lanscape-2.4.0a1}/lanscape/ui/blueprints/api/port.py

@@ -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-2.1.2 → lanscape-2.4.0a1}/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 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
+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,24 @@ 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:
+        # Bind to localhost only for better Chrome compatibility
+        run_server(host='127.0.0.1', 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 +103,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 +128,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 → lanscape-2.4.0a1}/lanscape/ui/static/css/style.css

@@ -66,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;
@@ -163,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 {
@@ -304,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;
@@ -447,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 */
@@ -564,8 +577,8 @@ input[type="range"] {
 /* Service Strategy Select Styles */
 .service-strategy-wrapper {
     position: relative;
-    display: inline-block;
-    width: 60%; /* Narrower than port list */
+    display: block;
+    width: 100%;
 }
 
 .service-strategy {
@@ -657,10 +670,6 @@ input[type="range"] {
 .table thead tr th.detail-col
 {
     width: 30px;
-    /*
-    background-color: var(--body-bg);
-    border: 1px solid var(--text-almost-hidden);
-    */
 }
 .table td:has(.info-icon-container) {
     width: 30px;
@@ -709,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);

{lanscape-2.1.2 → lanscape-2.4.0a1}/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-2.1.2 → lanscape-2.4.0a1}/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() {

{lanscape-2.1.2 → lanscape-2.4.0a1}/lanscape/ui/static/js/scan-config.js

@@ -139,15 +139,26 @@ function getScanConfig() {
 }
 
 function getPortLists(callback=null) {
-    $.get('/api/port/list', function(data) {
-        const customSelectDropdown = $('#port_list');
+    const customSelectDropdown = $('#port_list');
+
+    const renderOptions = (items) => {
         customSelectDropdown.empty();
-    
-        // Populate the dropdown with the options
-        data.forEach(function(portList) {
-            customSelectDropdown.append('<option>' + portList + '</option>');
+        items.forEach((item) => {
+            const name = item.name || item;
+            const count = item.count;
+            const label = count !== undefined ? `${name} (${count} ports)` : name;
+            customSelectDropdown.append(`<option value="${name}">${label}</option>`);
         });
+    };
+
+    $.get('/api/port/list/summary', function(data) {
+        renderOptions(data || []);
         if (callback) callback();
+    }).fail(function() {
+        $.get('/api/port/list', function(data) {
+            renderOptions(data || []);
+            if (callback) callback();
+        });
     });
 }
 

{lanscape-2.1.2 → lanscape-2.4.0a1}/lanscape/ui/templates/main.html

@@ -3,45 +3,43 @@
 {% block content %}
 <div id="header">
       <!-- Header and Scan Submission Inline -->
-    <div class="d-flex justify-content-between align-items-center flex-nowrap">
+    <div class="d-flex justify-content-between align-items-center flex-wrap">
         <a href="/" class="text-decoration-none" aria-label="Go to homepage">
             <h1 class="title">
                 <span>LAN</span>scape 
             </h1>
         </a>
         <!-- Right side: settings + form -->
-        <div class="d-flex align-items-center justify-content-end ms-auto">
-            <form id="scan-form" class="d-flex align-items-center">
-                <div class="form-group me-2">
-                    <!-- Above subnet input -->
-                    <div class="label-container">
-                        <label for="subnet">Subnet:</label>
-                        <div id="subnet-info"></div>
-                    </div>
-                    <!-- Subnet input with dropdown -->
-                    <div class="input-group">
-                        <button
-                            type="button"
-                            id="settings-btn"
-                            class="btn btn-secondary start"
-                            data-bs-toggle="tooltip"
-                            data-bs-placement="bottom"
-                            title="Advanced scan settings"
-                        >
-                            <i class="fa-solid fa-gear"></i>
-                        </button>
-                        <input type="text" id="subnet" name="subnet" class="form-control" value="{{ subnet }}" placeholder="Enter subnet">
-                        <button class="btn btn-secondary dropdown-toggle end" type="button" id="subnet-dropdown" data-bs-toggle="dropdown" aria-expanded="false"></button>
-                        <ul class="dropdown-menu" aria-labelledby="subnet-dropdown" id="dropdown-list">
-                            {% for subnet_option in alternate_subnets %}
-                            <li><a class="dropdown-item" href="#">{{ subnet_option['subnet'] }}</a></li>
-                            {% endfor %}
-                        </ul>
-                    </div>
+        <form id="scan-form" class="d-flex align-items-end">
+            <div class="form-group me-2">
+                <!-- Above subnet input -->
+                <div class="label-container">
+                    <label for="subnet">Subnet:</label>
+                    <div id="subnet-info"></div>
                 </div>
-                <button type="submit" id="scan-submit" class="btn btn-primary">Scan</button>
-            </form>
-        </div>
+                <!-- Subnet input with dropdown -->
+                <div class="input-group">
+                    <button
+                        type="button"
+                        id="settings-btn"
+                        class="btn btn-secondary start"
+                        data-bs-toggle="tooltip"
+                        data-bs-placement="bottom"
+                        title="Advanced scan settings"
+                    >
+                        <i class="fa-solid fa-gear"></i>
+                    </button>
+                    <input type="text" id="subnet" name="subnet" class="form-control" value="{{ subnet }}" placeholder="Enter subnet">
+                    <button class="btn btn-secondary dropdown-toggle end" type="button" id="subnet-dropdown" data-bs-toggle="dropdown" aria-expanded="false"></button>
+                    <ul class="dropdown-menu" aria-labelledby="subnet-dropdown" id="dropdown-list">
+                        {% for subnet_option in alternate_subnets %}
+                        <li><a class="dropdown-item" href="#">{{ subnet_option['subnet'] }}</a></li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            </div>
+            <button type="submit" id="scan-submit" class="btn btn-primary">Scan</button>
+        </form>
     </div>
 
     <div id="scan-progress-bar"></div>

{lanscape-2.1.2 → lanscape-2.4.0a1}/lanscape/ui/templates/scan/config.html

@@ -94,7 +94,7 @@
                     </div>
                     <div class="col-1 descriptor">=</div>
                     <div class="col-3">
-                        <label for="total-ping-attempts">Max pings per device</label>
+                        <label for="total-ping-attempts" id="tpa-label">Max pings per device</label>
                         <input type="number" id="total-ping-attempts" class="form-control" readonly>
                     </div>
                 </div>
@@ -201,7 +201,7 @@
             <div id="section-service-scan" class="form-group mt-2 config-section div-hide">
                 <h6>Service Scanning</h6>
                 <div class="row">
-                    <div class="col">
+                    <div class="col-12">
                         <label for="service_lookup_type" class="form-label">Strategy</label>
                         <div class="service-strategy-wrapper">
                             <select id="service_lookup_type" class="service-strategy">
@@ -211,11 +211,13 @@
                             </select>
                         </div>
                     </div>
-                    <div class="col">
+                </div>
+                <div class="row mt-2">
+                    <div class="col-12 col-md-6">
                         <label for="service_timeout" class="form-label">Timeout (sec)</label>
                         <input type="number" step="0.1" id="service_timeout" class="form-control">
                     </div>
-                    <div class="col">
+                    <div class="col-12 col-md-6 mt-2 mt-md-0">
                         <label for="service_max_concurrent_probes" class="form-label">Max Concurrent Probes</label>
                         <input type="number" id="service_max_concurrent_probes" class="form-control">
                     </div>

{lanscape-2.1.2 → lanscape-2.4.0a1}/lanscape/ui/templates/scan/ip-table-row.html

@@ -7,20 +7,20 @@
             ></i>
         </div>
     </td>
-    <td>
+    <td class="ip">
         <div>{{ device.ip }}</div>
         {% if device.hostname %} 
-            <div><span class=alt>{{device.hostname}}</span></div>
+            <span class="alt no-wrap">{{device.hostname}}</span>
         {% endif %}
     </td>
-    <td>
+    <td class="mac">
         <div>{{ device.mac_addr or 'Unknown' }}</div>
         {% if device.manufacturer %} 
-            <div><span class="alt">{{device.manufacturer}}</span></div>
+            <span class="alt no-wrap">{{device.manufacturer}}</span>
         {% endif %}
     </td>
-    <td>{{ device.ports | join(", ") }}</td>
-    <td>
+    <td class="ports">{{ device.ports | join(", ") }}</td>
+    <td class="stage">
         {% if device.stage == 'complete' %}
             <span class="badge badge-success">complete</span>
         {% elif device.stage == 'found' %}

{lanscape-2.1.2 → lanscape-2.4.0a1}/lanscape/ui/templates/scan/ip-table.html

@@ -9,10 +9,10 @@
         <thead>
             <tr>
                 <th class="detail-col" scope="col"></th>
-                <th scope="col">IP / <span class="alt">Host</span></th>
-                <th scope="col">MAC / <span class="alt">Manufacturer</span></th>
-                <th scope="col">Open Ports</th>
-                <th scope="col">Stage</th>
+                <th class="ip" scope="col">IP / <span class="alt">Host</span></th>
+                <th class="mac" scope="col">MAC / <span class="alt">Manufacturer</span></th>
+                <th class="ports" scope="col">Open Ports</th>
+                <th class="stage" scope="col">Stage</th>
             </tr>
         </thead>
         <tbody>

lanscape-2.4.0a1/lanscape/ui/ws/__init__.py

@@ -0,0 +1,31 @@
+"""
+WebSocket interface for LANscape.
+
+Provides a standalone WebSocket server that exposes all LANscape functionality,
+allowing clients to initiate scans, manage port lists, and receive real-time
+scan results with delta updates.
+"""
+
+from lanscape.ui.ws.server import WebSocketServer, run_server
+from lanscape.ui.ws.protocol import (
+    WSMessage,
+    WSRequest,
+    WSResponse,
+    WSError,
+    WSEvent,
+    MessageType
+)
+from lanscape.ui.ws.delta import DeltaTracker, ScanDeltaTracker
+
+__all__ = [
+    'WebSocketServer',
+    'run_server',
+    'WSMessage',
+    'WSRequest',
+    'WSResponse',
+    'WSError',
+    'WSEvent',
+    'MessageType',
+    'DeltaTracker',
+    'ScanDeltaTracker'
+]