weed-cli 1.6.2__tar.gz → 1.6.7__tar.gz

{weed_cli-1.6.2/weed_cli.egg-info → weed_cli-1.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weed-cli
-Version: 1.6.2
+Version: 1.6.7
 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
@@ -174,19 +174,28 @@ blind.
 ### Docker
 
 `Dockerfile.node` + `docker-compose.node.yml` package `web_ui.py` to run
-somewhere other than a laptop.
+somewhere other than a laptop — alongside its own local discovery relay
+(`Dockerfile.discovery-relay`), so there's always something real for it
+to announce to and discover from out of the box.
 
 ```bash
 make node                            # build + run, http://127.0.0.1:8080
 make node-down                       # stop it — data persists
+make node-shell                      # interactive weed shell, same container as the running node
 WEED_SHARE_DIR=~/Movies make node    # mount a real directory of .ott archives at /share
-docker compose -f docker-compose.node.yml exec node python3 shell.py   # interactive shell, same container
 docker compose -f docker-compose.node.yml exec node python3 weed.py discover  # or a one-off CLI command
 ```
 
 - Identity key, reputation store, and library manifest all persist in a
   named volume (`node-data`, mounted at `$HOME=/data`) — one node keeps
   the same pubkey (and everything vouching for it) across restarts.
+- The `relay` service is `node`'s default `WEED_RELAY` (`http://relay:9101`,
+  resolved over Compose's own network) — its events persist in their own
+  `relay-data` volume, and port 9101 is published to the host too, for
+  curling `/events` directly or pointing a non-Docker `weed`/shell session
+  at the exact same relay. Override `WEED_RELAY` (shell env or `.env`,
+  see `.env.sample`) to point at public infra instead, e.g. for a real
+  end-to-end test.
 - `/share` is a separate *bind* mount, not a named volume, so the actual
   `.ott` archives you're hosting are real files on the host you can see
   and manage directly. Point the web UI's Host form at `/share`.

{weed_cli-1.6.2 → weed_cli-1.6.7}/README.md

@@ -144,19 +144,28 @@ blind.
 ### Docker
 
 `Dockerfile.node` + `docker-compose.node.yml` package `web_ui.py` to run
-somewhere other than a laptop.
+somewhere other than a laptop — alongside its own local discovery relay
+(`Dockerfile.discovery-relay`), so there's always something real for it
+to announce to and discover from out of the box.
 
 ```bash
 make node                            # build + run, http://127.0.0.1:8080
 make node-down                       # stop it — data persists
+make node-shell                      # interactive weed shell, same container as the running node
 WEED_SHARE_DIR=~/Movies make node    # mount a real directory of .ott archives at /share
-docker compose -f docker-compose.node.yml exec node python3 shell.py   # interactive shell, same container
 docker compose -f docker-compose.node.yml exec node python3 weed.py discover  # or a one-off CLI command
 ```
 
 - Identity key, reputation store, and library manifest all persist in a
   named volume (`node-data`, mounted at `$HOME=/data`) — one node keeps
   the same pubkey (and everything vouching for it) across restarts.
+- The `relay` service is `node`'s default `WEED_RELAY` (`http://relay:9101`,
+  resolved over Compose's own network) — its events persist in their own
+  `relay-data` volume, and port 9101 is published to the host too, for
+  curling `/events` directly or pointing a non-Docker `weed`/shell session
+  at the exact same relay. Override `WEED_RELAY` (shell env or `.env`,
+  see `.env.sample`) to point at public infra instead, e.g. for a real
+  end-to-end test.
 - `/share` is a separate *bind* mount, not a named volume, so the actual
   `.ott` archives you're hosting are real files on the host you can see
   and manage directly. Point the web UI's Host form at `/share`.

{weed_cli-1.6.2 → weed_cli-1.6.7}/node.py

@@ -1034,6 +1034,26 @@ def _relay_url_hint(relay_url):
     return None
 
 
+def _normalize_relay_url(relay_url):
+    """A bare host:port with no scheme (e.g. '127.0.0.1:9101', the most
+    natural way to type a local relay) isn't a URL urllib can parse at
+    all -- everything before the first ':' becomes the *scheme*, so this
+    reads as scheme '127.0.0.1' and raises "unknown url type", not a
+    connection error. That already lands on post_event/fetch_events'
+    existing except clauses (an unreachable relay is routine, not
+    exceptional), which is exactly the trap: hosting against a
+    scheme-less relay used to report status: running with zero actual
+    announcements ever reaching it, and discover against one silently
+    came back empty -- nothing hinted that the URL itself, not the
+    relay, was the problem. Every relay this project actually ships or
+    documents is plain HTTP(S), so defaulting a missing scheme to
+    http:// turns the common typo into the thing the user obviously
+    meant instead of a silent no-op."""
+    if '://' not in relay_url:
+        return 'http://' + relay_url
+    return relay_url
+
+
 _dns_bound_pool = concurrent.futures.ThreadPoolExecutor(max_workers=8, thread_name_prefix='urlopen')
 
 
@@ -1059,6 +1079,7 @@ def post_event(relay_url, event):
     hint = _relay_url_hint(relay_url)
     if hint:
         return {'ok': False, 'error': hint}
+    relay_url = _normalize_relay_url(relay_url)
     req = urllib.request.Request(
         f'{relay_url}/event', data=json.dumps(event).encode(),
         headers={'Content-Type': 'application/json'}, method='POST')
@@ -1082,6 +1103,7 @@ def fetch_events(relay_url, event_type=None):
     if hint:
         print(f"  {relay_url}: {hint}")
         return None
+    relay_url = _normalize_relay_url(relay_url)
     url = f'{relay_url}/events' + (f'?type={event_type}' if event_type else '')
     try:
         with _urlopen_bounded(url, timeout=5) as resp:

{weed_cli-1.6.2 → weed_cli-1.6.7}/pyproject.toml

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

@@ -351,8 +351,21 @@ def _run_host_job(host_id, archive_dir, file_name, port, price, relay_urls, adve
             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, ott_status=ott_status)
+                    result = node.publish(identity, relay_url, entry['sha256'], entry['name'], host_addr,
+                                           tunnel=tunnel, ott_status=ott_status)
+                    # publish()/post_event() report a failed announce as a
+                    # normal {'ok': False, ...} return, not an exception (an
+                    # unreachable or malformed relay is routine, not
+                    # exceptional -- see post_event's own docstring) -- which
+                    # this loop used to just ignore entirely, so a host could
+                    # sit at status: running, "announced" on a relay it never
+                    # actually reached, with nothing in the UI to say so.
+                    # do_host (shell.py) already prints every result
+                    # unconditionally; this only prints the failures; a
+                    # working host's log staying free of routine "ok: True"
+                    # noise matters more here than in a CLI's own scrollback.
+                    if isinstance(result, dict) and not result.get('ok', True):
+                        print(f'  ✗ announce to {relay_url} failed: {result.get("error")}')
                 announced = relay_urls
             files = [{'name': e['name'], 'content_hash': e['sha256']} for e in entries]
             with _lock:

{weed_cli-1.6.2 → weed_cli-1.6.7/weed_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weed-cli
-Version: 1.6.2
+Version: 1.6.7
 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
@@ -174,19 +174,28 @@ blind.
 ### Docker
 
 `Dockerfile.node` + `docker-compose.node.yml` package `web_ui.py` to run
-somewhere other than a laptop.
+somewhere other than a laptop — alongside its own local discovery relay
+(`Dockerfile.discovery-relay`), so there's always something real for it
+to announce to and discover from out of the box.
 
 ```bash
 make node                            # build + run, http://127.0.0.1:8080
 make node-down                       # stop it — data persists
+make node-shell                      # interactive weed shell, same container as the running node
 WEED_SHARE_DIR=~/Movies make node    # mount a real directory of .ott archives at /share
-docker compose -f docker-compose.node.yml exec node python3 shell.py   # interactive shell, same container
 docker compose -f docker-compose.node.yml exec node python3 weed.py discover  # or a one-off CLI command
 ```
 
 - Identity key, reputation store, and library manifest all persist in a
   named volume (`node-data`, mounted at `$HOME=/data`) — one node keeps
   the same pubkey (and everything vouching for it) across restarts.
+- The `relay` service is `node`'s default `WEED_RELAY` (`http://relay:9101`,
+  resolved over Compose's own network) — its events persist in their own
+  `relay-data` volume, and port 9101 is published to the host too, for
+  curling `/events` directly or pointing a non-Docker `weed`/shell session
+  at the exact same relay. Override `WEED_RELAY` (shell env or `.env`,
+  see `.env.sample`) to point at public infra instead, e.g. for a real
+  end-to-end test.
 - `/share` is a separate *bind* mount, not a named volume, so the actual
   `.ott` archives you're hosting are real files on the host you can see
   and manage directly. Point the web UI's Host form at `/share`.