remotedesktop 2.1.0__py3-none-any.whl → 2.2.0__py3-none-any.whl

remotedesktop/__init__.py

@@ -1,3 +1,3 @@
 """Remote desktop client/server for Windows computers on the same LAN."""
 
-__version__ = "2.1.0"
+__version__ = "2.2.0"

remotedesktop/app.py

@@ -15,7 +15,9 @@ import logging
 import re
 import sqlite3
 import sys
+import threading
 import time
+from collections.abc import Callable
 from pathlib import Path
 
 from PySide6.QtCore import QObject, QProcess, QStandardPaths, Qt, QTimer, Signal
@@ -45,10 +47,15 @@ from PySide6.QtWidgets import (
 from remotedesktop import __version__, compat, db, icon, logs, window_state
 from remotedesktop.about import AboutDialog
 from remotedesktop.autostart import Autostart, installed_launcher
-from remotedesktop.client import DiscoveryPanel, ServerSession
+from remotedesktop.client import DiscoveryPanel, ServerSession, _broadcast_hosts
 from remotedesktop.clipboard import ClipboardSync
 from remotedesktop.config import KnownServers, Settings, default_db_path, load_client_identity
-from remotedesktop.discovery import DEFAULT_CONNECT_PORT, DISCOVERY_PORT, ServerInfo
+from remotedesktop.discovery import (
+    DEFAULT_CONNECT_PORT,
+    DISCOVERY_PORT,
+    ServerInfo,
+    discover_servers,
+)
 from remotedesktop.inventory import ConnectionInventory, InventoryTab
 from remotedesktop.logs import PeerLogDialog, read_log_tail
 from remotedesktop.modal_loop import HTCLOSE, HTMAXBUTTON, HTMINBUTTON, ModalLoopPump
@@ -73,6 +80,14 @@ _log = logging.getLogger("remotedesktop.app")
 # Auto-reconnect backoff never waits longer than this between attempts.
 _RECONNECT_CAP_SECONDS = 30.0
 
+# Once this many direct reconnect attempts at the last known address have
+# failed, each further failure also starts a discovery scan: the server may
+# have come back on a different address (DHCP after a reboot), and sessions,
+# tokens, and pins are all keyed by host:port. A re-discovered server is
+# matched by certificate fingerprint (name as the fallback) and the session
+# migrates to the new address — token included, so no re-approval.
+_REDISCOVER_AFTER_ATTEMPTS = 2
+
 
 class _SessionsTable(ViewersTable):
     """The client-side twin of the viewers table: one row per connected
@@ -121,6 +136,9 @@ class _ConnectedServersSource(QObject):
 
 
 class MainWindow(QMainWindow):
+    # A re-discovery scan finished on its worker thread: (session, servers).
+    _rediscoveryFinished = Signal(object, list)
+
     def __init__(
         self,
         *,
@@ -132,10 +150,19 @@ class MainWindow(QMainWindow):
         connect_port: int = DEFAULT_CONNECT_PORT,
         tray_available: bool | None = None,
         reconnect_base_seconds: float = 2.0,
+        rediscover: Callable[[], list[ServerInfo]] | None = None,
         effects_reducer: VisualEffectsReducer | None = None,
     ) -> None:
         super().__init__()
         self._reconnect_base = reconnect_base_seconds
+        # The blocking scan auto-reconnect uses to find a moved server; tests
+        # inject a fake so window tests never broadcast on the LAN.
+        self._rediscover = (
+            rediscover
+            if rediscover is not None
+            else lambda: discover_servers(broadcast_hosts=_broadcast_hosts())
+        )
+        self._rediscoveryFinished.connect(self._on_rediscovery_finished)
         self._auto_scan = auto_scan
         self.setWindowIcon(icon.app_icon("app"))
         # Tests inject a connection to a temp database; the app uses the default.
@@ -1370,6 +1397,10 @@ class MainWindow(QMainWindow):
         session.viewer.clear(message)
         self._set_session_status(session, f"{session.name}: {message}")
         self.log(f"[{session.name}] {message}")
+        # The direct address keeps failing — the server may be back under a
+        # different one. Scan alongside the backoff timer, not instead of it.
+        if session.reconnect_attempts >= _REDISCOVER_AFTER_ATTEMPTS:
+            self._start_rediscovery(session)
 
     def _attempt_reconnect(self, session: ServerSession) -> None:
         if (
@@ -1392,6 +1423,104 @@ class MainWindow(QMainWindow):
             session.reconnect_timer.stop()
         session.reconnect_attempts = 0
 
+    # -------------------------------------------- reconnect re-discovery
+
+    def _start_rediscovery(self, session: ServerSession) -> None:
+        """Scan the LAN for a server that moved to a new address.
+
+        Runs the blocking scan on a worker thread (the DiscoveryPanel
+        pattern) and delivers the result through a queued signal. This is
+        not background polling: it only runs while a session is actively
+        failing to reconnect, and stops the moment it succeeds.
+        """
+        if session.rediscovering:
+            return
+        session.rediscovering = True
+        _log.debug("Re-discovery scan for %s (%s)", session.name, session.key)
+        scan = self._rediscover
+
+        def run() -> None:
+            try:
+                servers = scan()
+            except OSError as error:
+                _log.warning("Re-discovery scan failed: %s", error)
+                servers = []
+            try:
+                self._rediscoveryFinished.emit(session, servers)
+            except RuntimeError:
+                pass  # the window was torn down while the scan ran
+
+        threading.Thread(target=run, name="reconnect-rediscovery", daemon=True).start()
+
+    def _on_rediscovery_finished(self, session: ServerSession, servers: list) -> None:
+        session.rediscovering = False
+        if (
+            session not in self._sessions
+            or session.connected
+            or session.denied
+            or not session.auto_reconnect
+            or self._quitting
+        ):
+            return
+        match = self._match_rediscovered(session, servers)
+        if match is None:
+            _log.debug("Re-discovery: %s not found among %d server(s)", session.name, len(servers))
+            return
+        if f"{match.host}:{match.port}" == session.key:
+            return  # still advertised at the failing address; keep direct retries
+        self._migrate_session(session, match)
+
+    def _match_rediscovered(self, session: ServerSession, servers: list) -> ServerInfo | None:
+        """The discovered server that is `session`'s peer, if any.
+
+        The pinned certificate fingerprint is the identity; the display name
+        is the fallback for servers too old to advertise one (soft matching,
+        like the soft cert pin — robust connections over strict identity).
+        """
+        record = self._known_servers.get(session.key)
+        pinned = (record or {}).get("fingerprint") or ""
+        candidates = [s for s in servers if not self._is_own_server(s)]
+        if pinned:
+            for server in candidates:
+                if server.fingerprint == pinned:
+                    return server
+        for server in candidates:
+            if server.name == session.name:
+                return server
+        return None
+
+    def _migrate_session(self, session: ServerSession, server: ServerInfo) -> None:
+        """Move a session (and its stored pairing) to the server's new
+        address, then reconnect immediately."""
+        old_key, new_key = session.key, f"{server.host}:{server.port}"
+        if self._session_for_key(new_key) is not None:
+            return  # the user already opened a session at the new address
+        record = self._known_servers.get(old_key)
+        if record is not None:
+            # Re-key the pairing so the stored token still applies — the
+            # whole point: no fresh approval just because DHCP moved the
+            # server.
+            self._known_servers.remember(
+                new_key, record.get("fingerprint") or "", record["token"]
+            )
+            self._known_servers.forget(old_key)
+        session.key = new_key
+        session.host, session.port = server.host, server.port
+        # The peer's inventory row moves with it; the stale address would
+        # otherwise linger as a permanently-unreachable duplicate.
+        self.client_inventory.remove(old_key)
+        self.client_inventory.record(
+            new_key, "attempt", name=session.name, address=new_key, detail=new_key
+        )
+        self._persist_sessions()
+        message = f"Found {session.name} at new address {new_key} (was {old_key}) — reconnecting"
+        self._set_session_status(session, message)
+        self.log(f"[{session.name}] {message}")
+        # A new address deserves a fresh backoff; the connect failure path
+        # re-arms it (and further re-discovery) if this address fails too.
+        self._cancel_reconnect(session)
+        session.client.connect_to(server.host, server.port)
+
     def _request_server_log(self) -> None:
         session = self._session_for_page(self._tabs.currentWidget())
         if session is None:

remotedesktop/client.py

@@ -233,5 +233,8 @@ class ServerSession:
         self.auto_reconnect = False
         self.reconnect_attempts = 0
         self.reconnect_timer: QTimer | None = None
+        # True while a re-discovery scan for this session runs on a worker
+        # thread (the server may have come back on a different address).
+        self.rediscovering = False
         # What the status bar shows while this session's tab is current.
         self.status_text = ""

remotedesktop/discovery.py

@@ -28,6 +28,10 @@ class ServerInfo:
     name: str
     host: str
     port: int
+    # The server's TLS certificate fingerprint, when it advertises one —
+    # a stable identity that survives address changes (DHCP gave the server
+    # a new IP after a reboot). Empty from servers too old to send it.
+    fingerprint: str = ""
 
 
 def _parse(data: bytes, expected_type: str) -> dict | None:
@@ -58,10 +62,14 @@ class DiscoveryResponder:
         name: str,
         connect_port: int,
         *,
+        fingerprint: str = "",
         discovery_port: int = DISCOVERY_PORT,
         bind_host: str = "",
     ) -> None:
-        self._reply = _encode("reply", name=name, port=connect_port)
+        # The fingerprint (`fp`) is optional in the reply: clients that
+        # predate it simply ignore the extra field.
+        extra = {"fp": fingerprint} if fingerprint else {}
+        self._reply = _encode("reply", name=name, port=connect_port, **extra)
         self._discovery_port = discovery_port
         self._bind_host = bind_host
         self._socket: socket.socket | None = None
@@ -181,6 +189,12 @@ def discover_servers(
             if not isinstance(name, str) or not isinstance(port, int):
                 _log.debug("Ignoring malformed reply from %s: %r", host, message)
                 continue
-            found.setdefault((host, port), ServerInfo(name=name, host=host, port=port))
+            fingerprint = message.get("fp")
+            if not isinstance(fingerprint, str):
+                fingerprint = ""
+            found.setdefault(
+                (host, port),
+                ServerInfo(name=name, host=host, port=port, fingerprint=fingerprint),
+            )
     _log.debug("Discovery scan finished: %d server(s) found", len(found))
     return list(found.values())

remotedesktop/server.py

@@ -295,8 +295,14 @@ class SharingTab(QWidget):
         self._listening = server.listen(self._connect_port)
         self._discoverable = False
         if self._listening:
+            # Advertising the cert fingerprint lets clients recognize this
+            # server by identity when its IP changes (auto-reconnect
+            # re-discovery), not just by address.
             responder = DiscoveryResponder(
-                self._name, server.port, discovery_port=self._discovery_port
+                self._name,
+                server.port,
+                fingerprint=tls.certificate_fingerprint(self._credentials[0]),
+                discovery_port=self._discovery_port,
             )
             try:
                 responder.start()

{remotedesktop-2.1.0.dist-info → remotedesktop-2.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: remotedesktop
-Version: 2.1.0
+Version: 2.2.0
 Summary: Remote desktop app for Windows computers on the same LAN, with autodiscovery. View other computers and optionally share this one — screen, keyboard, mouse, and clipboard, without RDP or Microsoft authentication.
 Project-URL: Homepage, https://github.com/jamesabel/remotedesktop
 Project-URL: Repository, https://github.com/jamesabel/remotedesktop
@@ -84,10 +84,10 @@ one-click *Forget* / *Revoke*, and the live connection log.
 - 🔒 **TLS + approve-once pairing** — every connection is encrypted; the server user approves a new client once, after which it reconnects with a stored token and no prompt.
 - 🔐 **Honest lock-screen behavior** — a locked server tells viewers so with a clear on-screen notice instead of a frozen frame, and streaming resumes by itself once someone signs in at the machine (see [The Windows lock screen](#the-windows-lock-screen)).
 - 📊 **Built-in performance monitoring** — live bandwidth and round-trip-time graphs with window statistics (mean/min/max/p99/jitter), plus a per-viewer table on the server.
-- 🔁 **Robust connections** — dead connections are detected within seconds, and dropped sessions reconnect automatically with backoff; a server restart heals by itself, no clicks needed. Connections that were open when the app closed are restored on the next start.
+- 🔁 **Robust connections** — dead connections are detected within seconds, and dropped sessions reconnect automatically with backoff; a server restart heals by itself, no clicks needed. Even a server that comes back on a **different IP address** (a new DHCP lease after a reboot) is found again: reconnection re-scans the LAN, recognizes the server by its certificate identity, and follows it to the new address — pairing intact, so still no prompt. Connections that were open when the app closed are restored on the next start.
 - 🚀 **Hands-off operation** — start-at-login (per-user, no admin rights) with a choice of minimized (the default and recommended — sharing resumes after a reboot with no clicks), normal, maximized, or not starting at all; close-to-tray while sharing (the screen stays available with the window closed); and a *Restart app* button usable from the remote session itself, so you can update the software without visiting the machine.
 - 🗃️ **Persistent peer inventory** — a SQLite-backed history of every peer seen on the LAN, with one-click *Revoke* / *Forget*.
-- 🧭 **Desktop-app niceties** — a real menu bar with standard shortcuts, a status-bar sharing indicator, a confirmation before quitting with viewers connected, and window/panel layout that persists across restarts.
+- 🧭 **Desktop-app niceties** — a real menu bar with standard shortcuts (Preferences on *File ▸ Preferences*, Ctrl+,; About on the Help menu), a status-bar sharing indicator, a confirmation before quitting with viewers connected, and window/panel layout that persists across restarts.
 
 In scope: screen, keyboard, mouse, and clipboard. Out of scope: shared
 drives, devices, and audio — and smooth playback of fast-changing
@@ -119,8 +119,8 @@ it prepares the environment on first use and launches the app.
 ## Quick start
 
 1. Run `remotedesktop` on both computers.
-2. On the computer to share, open *Preferences* and set *Server (sharing)*
-   to one of the *Shared* modes.
+2. On the computer to share, open *File ▸ Preferences* (Ctrl+,) and set
+   *Server (sharing)* to one of the *Shared* modes.
 3. On the viewing computer, the shared computer appears in the panel on
    the left — double-click it (or select it and click *Connect*).
 4. Approve the connection in the dialog that pops up on the shared
@@ -228,7 +228,8 @@ certificate the server generates and keeps, then simple length-prefixed
 messages on top — JSON for control (hello/welcome, input, clipboard,
 ping/pong for the round-trip-time graphs, log exchange) and binary
 payloads for frames and deltas. Discovery is a UDP broadcast probe that
-every server answers with its name and port (see below).
+every server answers with its name, port, and certificate fingerprint
+(see below).
 
 ## Versioning
 
@@ -248,7 +249,12 @@ not guaranteed. Keep both computers on the same version for best results.
 ## How discovery works
 
 The client broadcasts a small JSON probe over UDP (port 48653); each server
-on the LAN replies with its hostname and connection port. Windows Firewall
+on the LAN replies with its hostname, connection port, and TLS certificate
+fingerprint. The fingerprint is the server's stable identity: when a
+reconnecting client can no longer reach a server at its last known address
+(typically a new DHCP lease after a reboot), it re-scans and matches the
+fingerprint to follow the server to its new address, keeping the stored
+pairing token so no fresh approval is needed. Windows Firewall
 must allow Python to receive inbound UDP on that port for a server to be
 discoverable from other machines.
 

{remotedesktop-2.1.0.dist-info → remotedesktop-2.2.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
-remotedesktop/__init__.py,sha256=-MNcc0-pZ-lLU-bwVVZcMtLi1J_fIvmbTWQHdxpV5CM,100
+remotedesktop/__init__.py,sha256=u2ClDvV49VmCDrIduAONdKUtfp5pewVgOStW3k8-2eU,100
 remotedesktop/__main__.py,sha256=m4gvhT01Wd3_kNl8lNQihy7eG2O3mYBbYP__AwBnyos,158
 remotedesktop/about.py,sha256=gofXchMgQ2Sikv1kFBIl42M4L-LY4bFKMARd5HeEyio,3701
-remotedesktop/app.py,sha256=o8RmCx7IUQKRBNjN7E5ppUqYTTQntsaf_Tg6h7-uqRE,68708
+remotedesktop/app.py,sha256=7_TakYMXX0ZRD74MRQWK6ni2fpAtlANGfmB_1cj7kTM,74790
 remotedesktop/autostart.py,sha256=pxpKpm_4IvH73ZbAbzM1TOQVKyRnm7DxtcqRDWvpw2Q,4539
-remotedesktop/client.py,sha256=wZHQqClWBhXLyA1lQKF1jmsbGnyl62PI3_GTSxmaJM4,9900
+remotedesktop/client.py,sha256=PgmGDHgrWWeiyrT8OZQr9E7hFQV_NoS7mfK1YsnXlkM,10086
 remotedesktop/clipboard.py,sha256=x2OBCn8xtLFyvAjvLflJYr85aB0tiqWN30ZhlMHc6QU,14013
 remotedesktop/compat.py,sha256=i9_iobDCluK-7QXm-ZkXBCU3Qt0GTb0LobZ8XuyK9uk,1694
 remotedesktop/config.py,sha256=biU9FQHxB9oXFivIAhZVM2eeL6lUEpbB7cEcCGfWt_8,5022
 remotedesktop/cursor_shape.py,sha256=kgcAeM-4CebkmtF3c_quhZ9ZIq3sn7sw_YvydzW6LBU,3369
 remotedesktop/db.py,sha256=ppV366kZjEpqNXTuRrrBIE976cSoUddx3WSroygXeow,1732
-remotedesktop/discovery.py,sha256=yHpxxkID4Dc8InaPw9ho3qL93dX7lzYea53JiC23yug,6857
+remotedesktop/discovery.py,sha256=CzLOUo6L1xwmEmgIBs1WKFRZAyCMg6iqZNliwQdbo0g,7540
 remotedesktop/dxgi.py,sha256=-2fFsBcmbE3ps3_HBdP42D0LUKpZyqBjCZqdEgWFkAU,13573
 remotedesktop/frames.py,sha256=aUdOoWG7HoozKfD4Z1pVNBnmNoP7DAGGQEYgokSL0rM,4617
 remotedesktop/icon.py,sha256=6Gfqj2liZIj7wC_vdv-gMHr2uFupRYbQMntHXXjTBgU,2476
@@ -20,7 +20,7 @@ remotedesktop/modal_loop.py,sha256=eb7S5mGffaYYVOOrSrQulqCUPP7t3mINBj7R-hv5C9A,7
 remotedesktop/performance.py,sha256=2DvGYP39URSm3fgzYWnLJAdnmWc3NkCAHr2636nZguk,25337
 remotedesktop/preferences.py,sha256=mVKnR8fgWliyM5b5V7FXVBQH7jW15V4W2L93xwA9LMw,16716
 remotedesktop/protocol.py,sha256=Q-5n-s0YmZB7yzlICHzyc73JLvax-SO__5c7Bjg5xGw,3975
-remotedesktop/server.py,sha256=fJ1O5nYDSUSVQ_BIXSEKcEBFJCf0tCM2ubcQ2zvPyPY,17457
+remotedesktop/server.py,sha256=wlE-sQtuveW97ErcB-tl0TfSNqtyLxzLQnqvRzeflT4,17769
 remotedesktop/session_lock.py,sha256=W5_MGYVgn3fnWT7Nzgxtt-aqJsnvyrOyfG2aCZTFcnM,1881
 remotedesktop/sharing.py,sha256=HDFCWnONftVbp7s_R9-_DUzj_q1Q7PTKRYGSJPt2u0c,49282
 remotedesktop/single_instance.py,sha256=G14dXIKctGFv0CvyCjdbeqkXTdW2y88MS5FEgxZNFz8,3002
@@ -28,8 +28,8 @@ remotedesktop/tls.py,sha256=AGrBpDq1gdjQm7TZ74y2W5-RxyEcbsFDPlNdRvadaAk,3934
 remotedesktop/viewer.py,sha256=arrIpQIazqhbWlElAbXyqeHaHZ0JqxlNbPwavpPixyo,14545
 remotedesktop/visual_effects.py,sha256=NQPb6qpwlW6SUycYbw-7mZOOmlPzC5YsjolwcxNukGI,7468
 remotedesktop/window_state.py,sha256=LvTGg5ZFSuDmISxYU0xotrGZbL89oVqKo8LI7xQGKok,1579
-remotedesktop-2.1.0.dist-info/METADATA,sha256=y_q3BHcYL5_9bH8X3bQVATpZiCiysAsDw98TqAJrTTc,17032
-remotedesktop-2.1.0.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-remotedesktop-2.1.0.dist-info/entry_points.txt,sha256=t079osY5GlKUJP9JU5JVXlKrSrplLalw2koAslXWQWc,53
-remotedesktop-2.1.0.dist-info/licenses/LICENSE,sha256=6rWgMfDohGLDuJ0UFOyLphM28Nn0fuN26MczIQldMkc,1067
-remotedesktop-2.1.0.dist-info/RECORD,,
+remotedesktop-2.2.0.dist-info/METADATA,sha256=I7vDfRLUDtj-9KflaEYJHTYMdJc9KvlkNaJ4WCNSym8,17766
+remotedesktop-2.2.0.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+remotedesktop-2.2.0.dist-info/entry_points.txt,sha256=t079osY5GlKUJP9JU5JVXlKrSrplLalw2koAslXWQWc,53
+remotedesktop-2.2.0.dist-info/licenses/LICENSE,sha256=6rWgMfDohGLDuJ0UFOyLphM28Nn0fuN26MczIQldMkc,1067
+remotedesktop-2.2.0.dist-info/RECORD,,

{remotedesktop-2.1.0.dist-info → remotedesktop-2.2.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.31.0
+Generator: hatchling 1.32.0
 Root-Is-Purelib: true
 Tag: py3-none-any