lanscape 1.3.0a6__tar.gz → 1.3.1a1__tar.gz

{lanscape-1.3.0a6/src/lanscape.egg-info → lanscape-1.3.1a1}/PKG-INFO

@@ -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 → lanscape-1.3.1a1}/README.md

@@ -10,7 +10,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)
@@ -33,6 +34,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 → lanscape-1.3.1a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lanscape"
-version = "1.3.0a6"
+version = "1.3.1a1"
 authors = [
   { name="Michael Dennis", email="michael@dipduo.com" },
 ]
@@ -16,7 +16,7 @@ dependencies = [
     "Flask>=3.0,<5.0",
     "psutil>=6.0,<7.0",
     "requests>=2.32,<3.0", 
-    "Setuptools<81",
+    "setuptools",
     "scapy>=2.3.2,<3.0",
     "tabulate==0.9.0",
     "pytest"

{lanscape-1.3.0a6 → lanscape-1.3.1a1}/src/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-1.3.0a6 → lanscape-1.3.1a1}/src/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-1.3.0a6 → lanscape-1.3.1a1}/src/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-1.3.0a6 → lanscape-1.3.1a1}/src/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-1.3.0a6 → lanscape-1.3.1a1}/src/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-1.3.0a6 → lanscape-1.3.1a1}/src/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-1.3.1a1/src/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-1.3.0a6 → lanscape-1.3.1a1}/src/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-1.3.0a6 → lanscape-1.3.1a1}/src/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 → lanscape-1.3.1a1/src/lanscape.egg-info}/PKG-INFO

@@ -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 → lanscape-1.3.1a1}/src/lanscape.egg-info/SOURCES.txt

@@ -56,6 +56,7 @@ src/lanscape/ui/static/img/ico/site.webmanifest
 src/lanscape/ui/static/js/core.js
 src/lanscape/ui/static/js/layout-sizing.js
 src/lanscape/ui/static/js/main.js
+src/lanscape/ui/static/js/on-tab-close.js
 src/lanscape/ui/static/js/quietReload.js
 src/lanscape/ui/static/js/shutdown-server.js
 src/lanscape/ui/static/js/subnet-info.js

{lanscape-1.3.0a6 → lanscape-1.3.1a1}/src/lanscape.egg-info/requires.txt

@@ -1,7 +1,7 @@
 Flask<5.0,>=3.0
 psutil<7.0,>=6.0
 requests<3.0,>=2.32
-Setuptools<81
+setuptools
 scapy<3.0,>=2.3.2
 tabulate==0.9.0
 pytest