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

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

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

@@ -825,7 +825,26 @@ def download_with_auction(content_hash, relay_urls, out_path=None, k=3, use_ligh
 
 # ── discovery + social signals ──────────────────────────────────────────
 
+def _relay_url_hint(relay_url):
+    """Relays are plain HTTP(S) endpoints, hit via urllib -- tls:// is a
+    completely different, unrelated convention that only means something
+    to --tunnel (a hand-rolled raw-TCP-plus-TLS protocol, see
+    _connect_tunnel_socket/connect_via_tunnel). Easy to mix up since both
+    flags take a host:port-shaped value and this same tool uses tls://
+    for the other one; without this check the failure is just urllib's
+    raw 'unknown url type: tls' with no hint about why."""
+    if relay_url.startswith('tls://'):
+        return (f"{relay_url!r} looks like a --tunnel address, not a relay URL — "
+                f"relays are plain HTTP(S) endpoints, try "
+                f"'https://{relay_url[len('tls://'):]}' for --relay instead "
+                f"(tls:// only means something to --tunnel)")
+    return None
+
+
 def post_event(relay_url, event):
+    hint = _relay_url_hint(relay_url)
+    if hint:
+        return {'ok': False, 'error': hint}
     req = urllib.request.Request(
         f'{relay_url}/event', data=json.dumps(event).encode(),
         headers={'Content-Type': 'application/json'}, method='POST')
@@ -845,6 +864,10 @@ def post_event(relay_url, event):
 
 
 def fetch_events(relay_url, event_type=None):
+    hint = _relay_url_hint(relay_url)
+    if hint:
+        print(f"  {relay_url}: {hint}")
+        return None
     url = f'{relay_url}/events' + (f'?type={event_type}' if event_type else '')
     try:
         with urllib.request.urlopen(url, timeout=5) as resp:

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

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

@@ -137,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'),
-            'signer_pubkey': rec.get('signer_pubkey'), 'error': None,
+            '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
@@ -211,8 +211,7 @@ 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,
-                       signer_pubkey=None):
+def _run_download_job(job_id, content_hash, relay_urls, out_path, k, use_lightning, title=None):
     def on_progress(idx, n_chunks):
         with _lock:
             _jobs[job_id].update(idx=idx, n_chunks=n_chunks)
@@ -230,7 +229,6 @@ 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:
@@ -358,16 +356,13 @@ class Handler(BaseHTTPRequestHandler):
         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,
-                              'signer_pubkey': signer_pubkey, 'error': None}
+                              'content_hash': content_hash, 'path': None, 'title': title, 'error': None}
         threading.Thread(target=_run_download_job,
-                          args=(job_id, content_hash, relay_urls, out_path, k, use_lightning, title,
-                                signer_pubkey),
+                          args=(job_id, content_hash, relay_urls, out_path, k, use_lightning, title),
                           daemon=True).start()
         self._json({'job_id': job_id})
 

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

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