weed-cli 1.1.2__tar.gz → 1.1.4__tar.gz

{weed_cli-1.1.2 → weed_cli-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weed-cli
-Version: 1.1.2
+Version: 1.1.4
 Summary: Censorship-resistant video PoC — discovery/hosting/download over signed relay events, a real Kademlia DHT, or a TLS-capable NAT-traversal tunnel
 License: MIT
 Keywords: p2p,video,censorship-resistant,discovery,dht,kademlia,nat-traversal

{weed_cli-1.1.2 → weed_cli-1.1.4}/node.py

@@ -197,6 +197,29 @@ def load_leaves(archive_dir, root_hash):
         return json.load(f)
 
 
+def _graceful_close(sock):
+    """Plain sock.close() on an SSL-wrapped socket tears down the TCP
+    connection without ever sending a TLS close_notify -- fine for the
+    plaintext direct-connect path, but every tunneled connection here is
+    TLS all the way to Fly's edge (fly.tunnel-relay.toml terminates TLS
+    there, handlers = ["tls"]), and Fly's proxy logs that abrupt cutoff as
+    'fly-proxy-p2p/tls/tcp-backhaul: unexpected end of file' even though
+    the app-level protocol already got every byte it needed by then.
+    unwrap() sends the close_notify so the edge sees a clean shutdown
+    instead of a truncation."""
+    if isinstance(sock, ssl.SSLSocket):
+        try:
+            # unwrap() blocks waiting for the peer's own close_notify --
+            # cap that wait so a peer that's already gone can't leak this
+            # thread forever, same reasoning as the timeouts already used
+            # for connect_via_tunnel/_connect_tunnel_socket
+            sock.settimeout(5)
+            sock = sock.unwrap()
+        except (OSError, ssl.SSLError, ValueError):
+            pass
+    sock.close()
+
+
 def serve_session(conn, entries_by_hash, default_hash, price):
     """Handle every command on one connection, not just one — a download
     needs INFO + LEAVES + one FETCH per chunk (thousands, for a real
@@ -213,7 +236,7 @@ def serve_session(conn, entries_by_hash, default_hash, price):
     tunnel path (already scoped to one file before this function runs)
     keep working unchanged."""
     selected = default_hash
-    with conn:
+    try:
         while True:
             line = recv_line(conn)
             if not line:
@@ -256,6 +279,8 @@ def serve_session(conn, entries_by_hash, default_hash, price):
                 conn.sendall((f'DATA {base64.b64encode(data).decode()}\n').encode())
             elif parts[0] == 'PRICE':
                 conn.sendall(f'PRICE {price}\n'.encode())
+    finally:
+        _graceful_close(conn)
 
 
 def run_host_server(archive_dir, file_name, port, bind_host='0.0.0.0', quiet=False, price=0):
@@ -409,7 +434,7 @@ class HostConnection:
         return recv_line(self.sock)
 
     def close(self):
-        self.sock.close()
+        _graceful_close(self.sock)
 
     def __enter__(self):
         return self

{weed_cli-1.1.2 → weed_cli-1.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "weed-cli"
-version = "1.1.2"
+version = "1.1.4"
 description = "Censorship-resistant video PoC — discovery/hosting/download over signed relay events, a real Kademlia DHT, or a TLS-capable NAT-traversal tunnel"
 readme = "README.md"
 license = { text = "MIT" }

{weed_cli-1.1.2 → weed_cli-1.1.4}/web_ui.py

@@ -128,7 +128,8 @@ def _rehydrate_jobs_from_library():
         _jobs[rec['job_id']] = {
             'status': 'done', 'idx': 0, 'n_chunks': None,
             'content_hash': content_hash, 'path': rec['path'],
-            'title': rec.get('title'), 'error': None,
+            'title': rec.get('title'), 'size': rec.get('size'), 'bps': rec.get('bps'),
+            'error': None,
         }
 _lan_url = None   # set once in run_web_ui() -- the base URL a phone on the
                    # same LAN can actually reach this server at, or None if
@@ -208,14 +209,18 @@ def _run_download_job(job_id, content_hash, relay_urls, out_path, k, use_lightni
             _jobs[job_id].update(idx=idx, n_chunks=n_chunks)
 
     try:
+        t0 = time.time()
         with _quiet():
             path = node.download_with_auction(content_hash, relay_urls, out_path=out_path, k=k,
                                                use_lightning=use_lightning, on_progress=on_progress)
+        elapsed = time.time() - t0
+        size = os.path.getsize(path)
+        bps = size / elapsed if elapsed > 0 else None
         with _lock:
-            _jobs[job_id].update(status='done', path=path)
+            _jobs[job_id].update(status='done', path=path, size=size, bps=bps)
             _library['downloads'][content_hash] = {
                 'content_hash': content_hash, 'job_id': job_id, 'path': path,
-                'title': title, 'downloaded_at': time.time(),
+                'title': title, 'downloaded_at': time.time(), 'size': size, 'bps': bps,
             }
             _save_library()
     except SystemExit as e:

{weed_cli-1.1.2 → weed_cli-1.1.4}/weed_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weed-cli
-Version: 1.1.2
+Version: 1.1.4
 Summary: Censorship-resistant video PoC — discovery/hosting/download over signed relay events, a real Kademlia DHT, or a TLS-capable NAT-traversal tunnel
 License: MIT
 Keywords: p2p,video,censorship-resistant,discovery,dht,kademlia,nat-traversal