weed-cli 1.3.3__tar.gz → 1.4.2__tar.gz

{weed_cli-1.3.3 → weed_cli-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weed-cli
-Version: 1.3.3
+Version: 1.4.2
 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.3.3 → weed_cli-1.4.2}/node.py

@@ -197,6 +197,22 @@ def load_leaves(archive_dir, root_hash):
         return json.load(f)
 
 
+def resolve_file_path(entry, archive_dir):
+    """last_path is recorded at archive time (see ott's own manifest
+    writer) and is an absolute path on whatever machine ran `ott add` —
+    trusting it unconditionally breaks the moment archive_dir is the same
+    content mounted somewhere else (a Docker bind mount at /share instead
+    of the original /home/user/share it was archived from, a synced
+    folder on another machine, ...), since it's still non-empty and short-
+    circuits the `or` before archive_dir is ever considered. Falling back
+    whenever last_path doesn't actually exist trusts the directory the
+    caller explicitly told us to look in over a possibly-stale hint."""
+    last_path = entry.get('last_path')
+    if last_path and os.path.exists(last_path):
+        return last_path
+    return os.path.join(archive_dir, entry['name'])
+
+
 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
@@ -289,7 +305,7 @@ def run_host_server(archive_dir, file_name, port, bind_host='0.0.0.0', quiet=Fal
     entries_by_hash = {}
     for entry in entries:
         leaves = load_leaves(archive_dir, entry['sha256'])
-        file_path = entry.get('last_path') or os.path.join(archive_dir, entry['name'])
+        file_path = resolve_file_path(entry, archive_dir)
         if not os.path.exists(file_path):
             sys.exit(f"archived file not found on disk at {file_path}")
         entries_by_hash[entry['sha256']] = (entry, leaves, file_path)
@@ -741,8 +757,14 @@ def select_host(candidates, k=3, reputation=None, trust_in_signers=None):
                     print(f"  x {c['host']}: failed possession challenge ({k} chunks sampled) — skipping")
                     continue
                 price = get_price(conn)
-        except OSError as e:
-            print(f"  x {c['host']}: unreachable ({e})")
+        except (OSError, ValueError, KeyError) as e:
+            # ValueError also catches json.JSONDecodeError: a tunnel CONNECT
+            # paired with a dead/gone registration (or any host that closes
+            # mid-protocol) reads back '' instead of raising a socket error,
+            # and a malformed INFO dict raises KeyError on ['sha256'] above —
+            # either way this is one bad candidate, not a reason to abort the
+            # whole auction.
+            print(f"  x {c['host']}: unreachable ({type(e).__name__}: {e})")
             continue
         rep_score, rep_why = (reputation.trust_score(c['signer_pubkey'], trust_in_signers)
                                if reputation else (0.5, 'no reputation store'))

{weed_cli-1.3.3 → weed_cli-1.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "weed-cli"
-version = "1.3.3"
+version = "1.4.2"
 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.3.3 → weed_cli-1.4.2}/shell.py

@@ -183,7 +183,7 @@ class WeedShell(cmd.Cmd):
             relay_host, relay_port, use_tls = node._parse_tunnel(tunnel)
             expanded_dir = os.path.expanduser(archive_dir)
             for entry in entries:
-                file_path = entry.get('last_path') or os.path.join(expanded_dir, entry['name'])
+                file_path = node.resolve_file_path(entry, expanded_dir)
                 tt = threading.Thread(target=_bg,
                                        args=(node.run_host_tunnel, relay_host, relay_port,
                                              entry['sha256'], entry, all_leaves[entry['sha256']],

{weed_cli-1.3.3 → weed_cli-1.4.2}/web_ui.py

@@ -190,29 +190,40 @@ def _run_host_job(host_id, archive_dir, file_name, port, price, relay_urls, adve
     try:
         with _quiet():
             identity = _identity()
-            entry = node.find_manifest_entry(archive_dir, file_name)
+            # every distinct file in the archive, not just the last-added one
+            # — see load_manifest_entries' own docstring for why
+            # find_manifest_entry (singular) silently dropped every file but
+            # one out of a multi-file archive_dir, same bug shell.py's
+            # do_host already had fixed
+            entries = node.load_manifest_entries(archive_dir, file_name)
             # fail fast, before announcing anything — a manifest entry with no
             # matching chunk data would otherwise get announced to the relay
             # and only fail later, deep in a background thread with no way
             # for the UI to ever find out
-            leaves = node.load_leaves(archive_dir, entry['sha256'])
+            all_leaves = {e['sha256']: node.load_leaves(archive_dir, e['sha256']) for e in entries}
             announced = []
-            for relay_url in relay_urls:
-                host_addr = f'{advertise_host}:{port}'
-                node.publish(identity, relay_url, entry['sha256'], entry['name'], host_addr,
-                              tunnel=tunnel)
-                announced.append(relay_url)
+            for entry in entries:
+                for relay_url in relay_urls:
+                    host_addr = f'{advertise_host}:{port}'
+                    node.publish(identity, relay_url, entry['sha256'], entry['name'], host_addr,
+                                  tunnel=tunnel)
+                announced = relay_urls
+            files = [{'name': e['name'], 'content_hash': e['sha256']} for e in entries]
             with _lock:
-                _hosts[host_id].update(name=entry['name'], content_hash=entry['sha256'],
+                _hosts[host_id].update(files=files, name=files[0]['name'],
+                                        content_hash=files[0]['content_hash'],
                                         announced_on=announced, status='running')
             if tunnel:
+                # one control connection per file, each registered under its
+                # own content hash — see shell.py do_host's docstring
                 relay_host, relay_port, use_tls = node._parse_tunnel(tunnel)
                 expanded_dir = os.path.expanduser(archive_dir)
-                file_path = entry.get('last_path') or os.path.join(expanded_dir, entry['name'])
-                threading.Thread(target=node.run_host_tunnel,
-                                  args=(relay_host, relay_port, entry['sha256'], entry, leaves,
-                                        file_path, price),
-                                  kwargs={'use_tls': use_tls, 'quiet': True}, daemon=True).start()
+                for entry in entries:
+                    file_path = node.resolve_file_path(entry, expanded_dir)
+                    threading.Thread(target=node.run_host_tunnel,
+                                      args=(relay_host, relay_port, entry['sha256'], entry,
+                                            all_leaves[entry['sha256']], file_path, price),
+                                      kwargs={'use_tls': use_tls, 'quiet': True}, daemon=True).start()
             node.run_host_server(archive_dir, file_name, port, quiet=True, price=price)
     except SystemExit as e:
         with _lock:

{weed_cli-1.3.3 → weed_cli-1.4.2}/weed_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weed-cli
-Version: 1.3.3
+Version: 1.4.2
 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