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

lanscape/libraries/net_tools.py

@@ -38,13 +38,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()
@@ -341,17 +347,24 @@ def get_all_network_subnets():
 
     return subnets
 
-def smart_select_primary_subnet(subnets: List[dict]=get_all_network_subnets()) -> str:
+def smart_select_primary_subnet(subnets: List[dict] | None = None) -> str:
     """
-     Finds the largest subnet within max ip range
-     not perfect, but works better than subnets[0]
+    Finds the largest subnet within max ip range. If no subnets are
+    available, returns an empty string instead of raising ``KeyError``.
     """
+    subnets = subnets or get_all_network_subnets()
+
+    if not subnets:
+        return ""
+
     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):
+
+    if not selected:
         selected = subnets[0]
-    return selected['subnet']
+
+    return selected.get("subnet", "")
 
 

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/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')
@@ -29,6 +29,13 @@ def open_webapp(url: str) -> bool:
     """
     start = time.time()
     try:
+        if sys.platform.startswith("darwin"):
+            # macOS does not support chrome-style app mode via the generic
+            # method. Fallback to the system "open" command which will use the
+            # default browser.
+            subprocess.run(["open", url], check=True)
+            return True
+
         exe = get_default_browser_executable()
         if not exe:
             raise RuntimeError('Unable to find browser binary')
@@ -56,7 +63,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 +124,12 @@ 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 will use the system 'open' command to launch the default browser
+        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/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
@@ -62,11 +62,22 @@ set_global_safe('is_local',is_local_run)
 ################################
 
 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 +100,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

@@ -12,7 +12,7 @@ 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
 
 
@@ -100,13 +100,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 +126,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/js/on-tab-close.js

@@ -0,0 +1,29 @@
+// This is the payload you want to send on unload.
+// It can be as simple as JSON or just an empty POST.
+function sendOnUnload() {
+    const url = '/shutdown?type=browser-close';
+    const data = JSON.stringify({ });
+    // (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);
+        });
+    }
+}
+
+// Attach to both beforeunload and unload to increase reliability.
+// beforeunload fires slightly earlier, but some browsers block async work there.
+window.addEventListener('beforeunload', sendOnUnload);
+window.addEventListener('unload', sendOnUnload);

lanscape/ui/templates/core/scripts.html

@@ -3,3 +3,4 @@
 <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>
+<script src="{{ url_for('static', filename='js/on-tab-close.js') }}"></script>

lanscape/ui/templates/info.html

@@ -33,8 +33,8 @@
             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/" target="_blank">
+            <button class="btn btn-primary m-2">GitHub</button>
         </a>
         <a  href="https://github.com/mdennis281/LANscape" target="_blank">
             <button class="btn btn-secondary m-2">Project Repo</button>

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 1.3.0a6
+Version: 1.3.1a1
 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.1a1.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=JU4mnQptO3-WGGlGR4lCRvOM8qpoCIvw6CuApiTQ-t4,11855
 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/web_browser.py,sha256=jtF__C2rTXhlZsp98l2l5Qa-V2nUA8egu-Ldvo5k8lQ,4800
 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_api.py,sha256=sjcjt3b1ZwvQiALOSfXoQxTlN1Z1_TRPC0EEy-bRIgE,7313
 lanscape/tests/test_env.py,sha256=ivFhCcemJ9vbe0_KtUkbqDY4r9nsDB8rVLUVjV-sNj8,673
 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=jMr72omFHOJJWxb9vwfpC7Lg-YIpw-4sZFAbWHnx_D4,3594
+lanscape/ui/main.py,sha256=KObgvdOlIhx4VQgcaNLcLrnkFXmOhfVpUyI8tZDQmJo,4027
 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
@@ -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=VkEpnvrK1abY3fE8YnfAOZB4J1XvUZB8qz_m1elD2cQ,1095
 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/info.html,sha256=K2ckljQujyXBaf0VmKO7IMm2S_wmN0sHD4vWA8Y4gJA,2457
 lanscape/ui/templates/main.html,sha256=M12xJSN6Ga565vIPhdCiqcr1tYgDrqzuQTeuXtk-8yo,3759
 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=5dg0KsPnBPKXIuCah3CKCJRE7aijBE3dhUXMUzj15-U,601
 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.1a1.dist-info/licenses/LICENSE,sha256=cCO-NbS01Ilwc6djHjZ7LIgPFRkRmWdr0fH2ysXKioA,1090
+lanscape-1.3.1a1.dist-info/METADATA,sha256=EnT4ZtH3JI88rf2QLLpUs9h8Uc1d-pOK0XB_8vK064g,2567
+lanscape-1.3.1a1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lanscape-1.3.1a1.dist-info/top_level.txt,sha256=E9D4sjPz_6H7c85Ycy_pOS2xuv1Wm-ilKhxEprln2ps,9
+lanscape-1.3.1a1.dist-info/RECORD,,