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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weed-cli
-Version: 1.1.4
+Version: 1.2.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.1.4 → weed_cli-1.2.2}/node.py

@@ -541,6 +541,54 @@ def download(host_addr, out_path, tunnel=None, content_hash=None, on_progress=No
     return out_path
 
 
+def verify_local_download(content_hash, relay_urls, path):
+    """Re-checks an already-downloaded file against its own Merkle-
+    committed chunk hashes without re-downloading a single byte: one
+    INFO+LEAVES round-trip to a currently-advertising host (to learn
+    chunk_size and get the leaf hash list — this repo's protocol has no
+    way to fetch just that from the file itself), then a purely local
+    read-and-rehash of every chunk already on disk. Same trust chain
+    download() uses (Merkle-root the leaves against the host's advertised
+    sha256 before trusting anything it says), just pointed at bytes that
+    are already local instead of a live FETCH stream."""
+    from ott import merkle_root
+
+    hosts = discover_hosts_for(relay_urls, content_hash)
+    if not hosts:
+        return {'ok': False, 'error': 'no host currently advertising this content_hash on the given relay(s)'}
+    match = hosts[0]
+    tunnel = _parse_tunnel(match['tunnel']) if match.get('tunnel') else None
+
+    with open_connection(match['host'], tunnel=tunnel, content_hash=content_hash) as conn:
+        if content_hash and not tunnel:
+            sel = conn.request(f'SELECT {content_hash}')
+            if sel != 'OK':
+                return {'ok': False, 'error': f"host rejected SELECT: {sel}"}
+        info = json.loads(conn.request('INFO'))
+        leaves = json.loads(conn.request('LEAVES'))
+
+    if len(leaves) != info['n_chunks'] or merkle_root(leaves) != info['sha256'] \
+            or info['sha256'] != content_hash:
+        return {'ok': False, 'error': "host's advertised LEAVES don't Merkle-root to this "
+                                       "content_hash — refusing to trust it as a reference"}
+    if not os.path.isfile(path):
+        return {'ok': False, 'error': f'{path} no longer exists on disk'}
+
+    actual_size = os.path.getsize(path)
+    if actual_size != info['size']:
+        return {'ok': False, 'error': f'local file is {actual_size:,} bytes, host advertises '
+                                       f'{info["size"]:,} — refetch with re-download'}
+
+    mismatches = []
+    with open(path, 'rb') as f:
+        for idx in range(info['n_chunks']):
+            data = f.read(info['chunk_size'])
+            if hashlib.sha256(data).hexdigest() != leaves[idx]:
+                mismatches.append(idx)
+
+    return {'ok': not mismatches, 'n_chunks': info['n_chunks'], 'mismatches': mismatches}
+
+
 # ── possession challenge + price auction, wired to real discovery ───────
 #
 # Everything below stitches poc_challenge_auction.py (challenge-gate a

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "weed-cli"
-version = "1.1.4"
+version = "1.2.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.1.4 → weed_cli-1.2.2}/web_ui.py

@@ -38,6 +38,14 @@ WEB_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'web')
 DEFAULT_RELAY = 'http://127.0.0.1:9101'
 LIBRARY_PATH = os.path.expanduser('~/.weed_library.json')
 
+# script-relative, not CWD-relative -- same reasoning as WEB_DIR above, so
+# downloads land in the same place regardless of the directory this was
+# launched from (previously defaulted to a bare filename, which meant
+# download_<hash> files scattered directly into whatever the CWD happened
+# to be when web_ui.py was started)
+DOWNLOADS_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'downloads')
+os.makedirs(DOWNLOADS_DIR, exist_ok=True)
+
 
 class _JobStdout:
     """Replaces sys.stdout for this whole process so a background job
@@ -129,7 +137,7 @@ def _rehydrate_jobs_from_library():
             'status': 'done', 'idx': 0, 'n_chunks': None,
             'content_hash': content_hash, 'path': rec['path'],
             'title': rec.get('title'), 'size': rec.get('size'), 'bps': rec.get('bps'),
-            'error': None,
+            'signer_pubkey': rec.get('signer_pubkey'), '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
@@ -203,7 +211,8 @@ def _run_host_job(host_id, archive_dir, file_name, port, price, relay_urls, adve
             _hosts[host_id].update(status='error', error=f'{type(e).__name__}: {e}')
 
 
-def _run_download_job(job_id, content_hash, relay_urls, out_path, k, use_lightning, title=None):
+def _run_download_job(job_id, content_hash, relay_urls, out_path, k, use_lightning, title=None,
+                       signer_pubkey=None):
     def on_progress(idx, n_chunks):
         with _lock:
             _jobs[job_id].update(idx=idx, n_chunks=n_chunks)
@@ -221,6 +230,7 @@ def _run_download_job(job_id, content_hash, relay_urls, out_path, k, use_lightni
             _library['downloads'][content_hash] = {
                 'content_hash': content_hash, 'job_id': job_id, 'path': path,
                 'title': title, 'downloaded_at': time.time(), 'size': size, 'bps': bps,
+                'signer_pubkey': signer_pubkey,
             }
             _save_library()
     except SystemExit as e:
@@ -231,6 +241,19 @@ def _run_download_job(job_id, content_hash, relay_urls, out_path, k, use_lightni
             _jobs[job_id].update(status='error', error=f'{type(e).__name__}: {e}')
 
 
+class WebUIServer(ThreadingHTTPServer):
+    def handle_error(self, request, client_address):
+        """A client opening a TCP connection and resetting it before ever
+        sending a request line is routine, not a bug -- phone browsers,
+        a QR-scanner app's in-app preview, and Chrome's own speculative
+        preconnects all do this. socketserver's default handle_error
+        prints a full traceback for every one of these; only genuinely
+        unexpected errors get that treatment here."""
+        if sys.exc_info()[0] in (ConnectionResetError, BrokenPipeError, TimeoutError):
+            return
+        super().handle_error(request, client_address)
+
+
 class Handler(BaseHTTPRequestHandler):
     def log_message(self, fmt, *args):
         pass  # quiet — this is a local UI, not a service worth logging every hit for
@@ -296,6 +319,7 @@ class Handler(BaseHTTPRequestHandler):
         handlers = {
             '/api/host': self._handle_host, '/api/download': self._handle_download,
             '/api/like': self._handle_like, '/api/subscribe': self._handle_subscribe,
+            '/api/verify': self._handle_verify,
         }
         handler = handlers.get(path)
         if not handler:
@@ -330,17 +354,20 @@ class Handler(BaseHTTPRequestHandler):
         if not content_hash:
             return self._json({'error': 'content_hash required'}, status=400)
         relay_urls = _as_list(body.get('relay'), [DEFAULT_RELAY])
-        out_path = body.get('out_path') or f'download_{content_hash[:16]}'
+        out_path = body.get('out_path') or os.path.join(DOWNLOADS_DIR, f'download_{content_hash[:16]}')
         k = int(body.get('k') or 3)
         use_lightning = bool(body.get('lightning'))
         title = body.get('title')
+        signer_pubkey = body.get('signer_pubkey')
 
         job_id = uuid.uuid4().hex[:12]
         with _lock:
             _jobs[job_id] = {'status': 'running', 'idx': 0, 'n_chunks': None,
-                              'content_hash': content_hash, 'path': None, 'title': title, 'error': None}
+                              'content_hash': content_hash, 'path': None, 'title': title,
+                              'signer_pubkey': signer_pubkey, 'error': None}
         threading.Thread(target=_run_download_job,
-                          args=(job_id, content_hash, relay_urls, out_path, k, use_lightning, title),
+                          args=(job_id, content_hash, relay_urls, out_path, k, use_lightning, title,
+                                signer_pubkey),
                           daemon=True).start()
         self._json({'job_id': job_id})
 
@@ -370,6 +397,26 @@ class Handler(BaseHTTPRequestHandler):
                 _save_library()
         self._json({'result': result})
 
+    def _handle_verify(self, body):
+        """Re-checks an already-downloaded file against its own
+        Merkle-committed chunk hashes without re-fetching it -- see
+        node.verify_local_download's docstring. Runs synchronously (this
+        is a local read + one INFO/LEAVES round-trip, not a real
+        download, so it's fast enough not to need a job/poll dance like
+        /api/download does)."""
+        content_hash = body.get('content_hash')
+        if not content_hash:
+            return self._json({'error': 'content_hash required'}, status=400)
+        with _lock:
+            rec = _library['downloads'].get(content_hash)
+        if not rec:
+            return self._json({'error': 'no local download on record for this content_hash'},
+                               status=404)
+        relay_urls = _as_list(body.get('relay'), [DEFAULT_RELAY])
+        with _quiet():
+            result = node.verify_local_download(content_hash, relay_urls, rec['path'])
+        self._json(result)
+
     def _handle_stream(self, job_id):
         """Serve an already-downloaded job's file with real HTTP range
         support, so a <video> tag can seek/scrub instead of just
@@ -468,17 +515,29 @@ class Handler(BaseHTTPRequestHandler):
         self.send_response(200)
         self.send_header('Content-Type', ctype or 'application/octet-stream')
         self.send_header('Content-Length', str(len(body)))
+        # this UI's still under active iteration -- every static file is
+        # re-read from disk fresh on every request (no server-side
+        # caching at all), so the only thing that can ever be stale is a
+        # browser hanging onto an old copy of index.html/vue-app.js from
+        # its own heuristics. No new dependency needed to fix that, just
+        # telling it not to.
+        self.send_header('Cache-Control', 'no-store')
         self.end_headers()
         self.wfile.write(body)
 
 
-def run_web_ui(port=8080, bind_host='127.0.0.1', quiet=False):
+def run_web_ui(port=8080, bind_host='127.0.0.1', quiet=False, advertise_host=None):
     global _lan_url
     _load_library()
     _rehydrate_jobs_from_library()
-    srv = ThreadingHTTPServer((bind_host, port), Handler)
-
-    reachable_host = _detect_lan_ip() if bind_host == '0.0.0.0' else bind_host
+    srv = WebUIServer((bind_host, port), Handler)
+
+    # advertise_host is an escape hatch for _detect_lan_ip()'s UDP-route
+    # trick guessing wrong (multiple interfaces/VPNs, sandboxed or
+    # container networking, no outbound route at all) -- same failure
+    # shape as "the QR/lan-url doesn't point at a reachable address",
+    # just fixed by telling this explicitly instead of guessing
+    reachable_host = advertise_host or (_detect_lan_ip() if bind_host == '0.0.0.0' else bind_host)
     if bind_host != '127.0.0.1' and reachable_host:
         _lan_url = f'http://{reachable_host}:{port}/'
 
@@ -513,9 +572,15 @@ def main():
     parser.add_argument('--bind', default='127.0.0.1',
                          help='bind address (default: 127.0.0.1, local only -- no auth is '
                               'built, so only widen this on a network you trust)')
+    parser.add_argument('--advertise-host',
+                         help="IP/hostname to put in the phone QR and lan-url instead of "
+                              "auto-detecting it -- use this if the QR at startup was missing "
+                              "or pointed at the wrong address (auto-detection guesses via an "
+                              "outbound route, which can pick the wrong interface or fail "
+                              "outright on unusual networking)")
     args = parser.parse_args()
     port = args.port_flag if args.port_flag is not None else args.port
-    run_web_ui(port, bind_host=args.bind)
+    run_web_ui(port, bind_host=args.bind, advertise_host=args.advertise_host)
 
 
 if __name__ == '__main__':

{weed_cli-1.1.4 → weed_cli-1.2.2}/weed.py

@@ -118,6 +118,10 @@ def build_parser():
     p_web.add_argument('--bind', default='127.0.0.1',
                         help='bind address (default 127.0.0.1 — local only; no auth is built, '
                              'so only widen this on a network you trust)')
+    p_web.add_argument('--advertise-host',
+                        help='IP/hostname for the phone QR and lan-url instead of '
+                             'auto-detecting it — use this if the startup QR was missing or '
+                             'pointed at the wrong address')
 
     p_serve = sub.add_parser('serve', help='alias for "web" with positional args, '
                                             'e.g. `serve 0.0.0.0 8080`')
@@ -126,6 +130,10 @@ def build_parser():
                                'from your phone — no auth is built, only widen this on a '
                                'network you trust)')
     p_serve.add_argument('port', nargs='?', type=int, default=8080)
+    p_serve.add_argument('--advertise-host',
+                          help='IP/hostname for the phone QR and lan-url instead of '
+                               'auto-detecting it — use this if the startup QR was missing or '
+                               'pointed at the wrong address')
 
     return parser
 
@@ -209,7 +217,7 @@ def cmd_subscribe(args):
 
 def cmd_web(args):
     import web_ui
-    web_ui.run_web_ui(port=args.port, bind_host=args.bind)
+    web_ui.run_web_ui(port=args.port, bind_host=args.bind, advertise_host=args.advertise_host)
 
 
 NATIVE_COMMANDS = {

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

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