@le-space/rootfs 0.6.24 → 0.6.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@le-space/rootfs",
-  "version": "0.6.24",
+  "version": "0.6.26",
   "description": "Shared rootfs contract parsing, reference profile assets, and build helpers.",
   "license": "MIT",
   "type": "module",

package/reference/orbitdb-relay/rootfs/orbitdb-relay-bootstrap-refresh.py

@@ -27,9 +27,7 @@ DESCRIBE_SCRIPT = os.environ.get(
 DEFAULT_API_HOST = os.environ.get("ALEPH_BOOTSTRAP_API_HOST", "https://api.aleph.im")
 DEFAULT_CHANNEL = os.environ.get("ALEPH_BOOTSTRAP_CHANNEL", "simple-todo")
 DEFAULT_REF = os.environ.get("ALEPH_BOOTSTRAP_REF", "simple-todo-bootstrap")
-COMPACT_POST_TYPE = "relay-bootstrap-v2"
-LEGACY_POST_TYPE = "relay-bootstrap"
-DEFAULT_POST_TYPE = os.environ.get("ALEPH_BOOTSTRAP_POST_TYPE", COMPACT_POST_TYPE)
+POST_TYPE = "relay-bootstrap-v2"
 DEFAULT_PROFILE = os.environ.get("ALEPH_BOOTSTRAP_PROFILE", "orbitdb-relay")
 MAX_PREVIOUS_PAGES = int(os.environ.get("ALEPH_BOOTSTRAP_MAX_PREVIOUS_PAGES", "5"))
 PAGINATION = int(os.environ.get("ALEPH_BOOTSTRAP_PAGINATION", "50"))
@@ -430,6 +428,15 @@ def parse_post_record(entry: object) -> dict[str, object] | None:
             item_content = None
 
     content_source = item_content if isinstance(item_content, dict) else entry
+    record_type = content_source.get("type")
+    if record_type == "relay-bootstrap":
+        raise RuntimeError(
+            "Legacy relay-bootstrap record encountered. Only relay-bootstrap-v2 is supported."
+        )
+    if isinstance(record_type, str) and record_type and record_type != POST_TYPE:
+        raise RuntimeError(
+            f"Unsupported relay bootstrap post type: {record_type}. Expected {POST_TYPE}."
+        )
     content = content_source.get("content")
     if not isinstance(content, dict):
         return None
@@ -465,7 +472,7 @@ def fetch_previous_hashes(
     api_host: str,
     channel: str,
     ref: str,
-    post_types: list[str],
+    post_type: str,
     sender: str,
     current_item_hash: str,
     now_ms: int,
@@ -473,38 +480,37 @@ def fetch_previous_hashes(
     stale_cutoff_ms = now_ms - (STALE_RECORD_MAX_AGE_SECONDS * 1000)
     normalized_sender = normalize_address(sender)
     found: list[str] = []
-    for post_type in post_types:
-        for page in range(1, MAX_PREVIOUS_PAGES + 1):
-            url = (
-                f"{api_host.rstrip('/')}/api/v0/posts.json?"
-                f"channels={urllib.parse.quote(channel)}&"
-                f"refs={urllib.parse.quote(ref)}&"
-                f"types={urllib.parse.quote(post_type)}&"
-                f"pagination={PAGINATION}&page={page}"
-            )
-            payload = get_json(url)
-            posts = payload.get("posts")
-            if not isinstance(posts, list):
-                break
-
-            for entry in posts:
-                parsed = parse_post_record(entry)
-                if parsed is None:
-                    continue
-                same_publisher = normalized_sender in {
-                    normalize_address(parsed["sender"]),
-                    normalize_address(parsed["publisher_address"]),
-                }
-                if not same_publisher:
-                    continue
-                if parsed["item_hash"] == current_item_hash:
-                    continue
-                updated_at = timestamp_ms(parsed["updated_at"])
-                if updated_at is not None and updated_at < stale_cutoff_ms:
-                    found.append(str(parsed["item_hash"]))
-
-            if len(posts) < PAGINATION:
-                break
+    for page in range(1, MAX_PREVIOUS_PAGES + 1):
+        url = (
+            f"{api_host.rstrip('/')}/api/v0/posts.json?"
+            f"channels={urllib.parse.quote(channel)}&"
+            f"refs={urllib.parse.quote(ref)}&"
+            f"types={urllib.parse.quote(post_type)}&"
+            f"pagination={PAGINATION}&page={page}"
+        )
+        payload = get_json(url)
+        posts = payload.get("posts")
+        if not isinstance(posts, list):
+            break
+
+        for entry in posts:
+            parsed = parse_post_record(entry)
+            if parsed is None:
+                continue
+            same_publisher = normalized_sender in {
+                normalize_address(parsed["sender"]),
+                normalize_address(parsed["publisher_address"]),
+            }
+            if not same_publisher:
+                continue
+            if parsed["item_hash"] == current_item_hash:
+                continue
+            updated_at = timestamp_ms(parsed["updated_at"])
+            if updated_at is not None and updated_at < stale_cutoff_ms:
+                found.append(str(parsed["item_hash"]))
+
+        if len(posts) < PAGINATION:
+            break
 
     return dedupe(found)
 
@@ -568,18 +574,16 @@ def main() -> None:
     version = env_values.get("ALEPH_BOOTSTRAP_VERSION", "").strip() or None
     channel = env_values.get("ALEPH_BOOTSTRAP_CHANNEL", DEFAULT_CHANNEL).strip() or DEFAULT_CHANNEL
     ref = env_values.get("ALEPH_BOOTSTRAP_REF", DEFAULT_REF).strip() or DEFAULT_REF
-    post_type = env_values.get("ALEPH_BOOTSTRAP_POST_TYPE", DEFAULT_POST_TYPE).strip() or DEFAULT_POST_TYPE
+    post_type = env_values.get("ALEPH_BOOTSTRAP_POST_TYPE", POST_TYPE).strip() or POST_TYPE
+    if post_type != POST_TYPE:
+        raise RuntimeError(
+            f"Unsupported ALEPH_BOOTSTRAP_POST_TYPE: {post_type}. Expected {POST_TYPE}."
+        )
     api_host = env_values.get("ALEPH_BOOTSTRAP_API_HOST", DEFAULT_API_HOST).strip() or DEFAULT_API_HOST
-    compact = post_type == COMPACT_POST_TYPE
-    published_multiaddrs = (
-        select_compact_multiaddrs(browser_multiaddrs or multiaddrs)
-        if compact
-        else multiaddrs
-    )
-    published_browser_multiaddrs = [] if compact else browser_multiaddrs
+    published_multiaddrs = select_compact_multiaddrs(browser_multiaddrs or multiaddrs)
+    published_browser_multiaddrs: list[str] = []
     if not published_multiaddrs:
-        reason = "no public browser multiaddrs" if compact else "no public multiaddrs"
-        print(json_dumps({"status": "skipped", "reason": reason}))
+        print(json_dumps({"status": "skipped", "reason": "no public browser multiaddrs"}))
         return
 
     owner_authorization = load_owner_authorization(
@@ -634,7 +638,7 @@ def main() -> None:
         api_host,
         channel,
         ref,
-        [post_type, LEGACY_POST_TYPE] if compact else [post_type],
+        post_type,
         publisher_address,
         str(unsigned_message["item_hash"]),
         now_ms,

package/reference/uc-go-peer/rootfs/uc-go-peer-bootstrap-deregister.py

@@ -23,7 +23,7 @@ DESCRIBE_SCRIPT = os.environ.get("DESCRIBE_SCRIPT", "/usr/local/sbin/uc-go-peer-
 DEFAULT_API_HOST = os.environ.get("ALEPH_BOOTSTRAP_API_HOST", "https://api.aleph.im")
 DEFAULT_CHANNEL = os.environ.get("ALEPH_BOOTSTRAP_CHANNEL", "simple-todo")
 DEFAULT_REF = os.environ.get("ALEPH_BOOTSTRAP_REF", "simple-todo-bootstrap")
-DEFAULT_POST_TYPE = os.environ.get("ALEPH_BOOTSTRAP_POST_TYPE", "relay-bootstrap")
+POST_TYPE = "relay-bootstrap-v2"
 MAX_PREVIOUS_PAGES = int(os.environ.get("ALEPH_BOOTSTRAP_MAX_PREVIOUS_PAGES", "5"))
 PAGINATION = int(os.environ.get("ALEPH_BOOTSTRAP_PAGINATION", "50"))
 
@@ -185,6 +185,16 @@ def parse_post_record(entry: object) -> dict[str, object] | None:
     if not isinstance(item_content, dict):
         return None
 
+    record_type = item_content.get("type")
+    if record_type == "relay-bootstrap":
+        raise RuntimeError(
+            "Legacy relay-bootstrap record encountered. Only relay-bootstrap-v2 is supported."
+        )
+    if isinstance(record_type, str) and record_type and record_type != POST_TYPE:
+        raise RuntimeError(
+            f"Unsupported relay bootstrap post type: {record_type}. Expected {POST_TYPE}."
+        )
+
     content = item_content.get("content")
     if not isinstance(content, dict):
         return None
@@ -297,7 +307,11 @@ def main() -> None:
     peer_id = load_peer_id()
     channel = env_values.get("ALEPH_BOOTSTRAP_CHANNEL", DEFAULT_CHANNEL).strip() or DEFAULT_CHANNEL
     ref = env_values.get("ALEPH_BOOTSTRAP_REF", DEFAULT_REF).strip() or DEFAULT_REF
-    post_type = env_values.get("ALEPH_BOOTSTRAP_POST_TYPE", DEFAULT_POST_TYPE).strip() or DEFAULT_POST_TYPE
+    post_type = env_values.get("ALEPH_BOOTSTRAP_POST_TYPE", POST_TYPE).strip() or POST_TYPE
+    if post_type != POST_TYPE:
+        raise RuntimeError(
+            f"Unsupported ALEPH_BOOTSTRAP_POST_TYPE: {post_type}. Expected {POST_TYPE}."
+        )
     api_host = env_values.get("ALEPH_BOOTSTRAP_API_HOST", DEFAULT_API_HOST).strip() or DEFAULT_API_HOST
 
     hashes = fetch_current_hashes(

package/reference/uc-go-peer/rootfs/uc-go-peer-bootstrap-refresh.py

@@ -25,9 +25,7 @@ DESCRIBE_SCRIPT = os.environ.get("DESCRIBE_SCRIPT", "/usr/local/sbin/uc-go-peer-
 DEFAULT_API_HOST = os.environ.get("ALEPH_BOOTSTRAP_API_HOST", "https://api.aleph.im")
 DEFAULT_CHANNEL = os.environ.get("ALEPH_BOOTSTRAP_CHANNEL", "simple-todo")
 DEFAULT_REF = os.environ.get("ALEPH_BOOTSTRAP_REF", "simple-todo-bootstrap")
-COMPACT_POST_TYPE = "relay-bootstrap-v2"
-LEGACY_POST_TYPE = "relay-bootstrap"
-DEFAULT_POST_TYPE = os.environ.get("ALEPH_BOOTSTRAP_POST_TYPE", COMPACT_POST_TYPE)
+POST_TYPE = "relay-bootstrap-v2"
 DEFAULT_PROFILE = os.environ.get("ALEPH_BOOTSTRAP_PROFILE", "uc-go-peer")
 MAX_PREVIOUS_PAGES = int(os.environ.get("ALEPH_BOOTSTRAP_MAX_PREVIOUS_PAGES", "5"))
 PAGINATION = int(os.environ.get("ALEPH_BOOTSTRAP_PAGINATION", "50"))
@@ -72,10 +70,9 @@ def has_peer_id(addr: str) -> bool:
 
 def is_browser_dialable(addr: str) -> bool:
     normalized = addr.lower()
-    return any(
-        token in normalized
-        for token in ("/ws", "/wss", "/webtransport", "/webrtc-direct")
-    )
+    if "/webtransport" in normalized or "/webrtc-direct" in normalized:
+        return "/certhash/" in normalized
+    return "/ws" in normalized or "/wss" in normalized
 
 
 def is_public_multiaddr(addr: str) -> bool:
@@ -442,6 +439,15 @@ def parse_post_record(entry: object) -> dict[str, object] | None:
             item_content = None
 
     content_source = item_content if isinstance(item_content, dict) else entry
+    record_type = content_source.get("type")
+    if record_type == "relay-bootstrap":
+        raise RuntimeError(
+            "Legacy relay-bootstrap record encountered. Only relay-bootstrap-v2 is supported."
+        )
+    if isinstance(record_type, str) and record_type and record_type != POST_TYPE:
+        raise RuntimeError(
+            f"Unsupported relay bootstrap post type: {record_type}. Expected {POST_TYPE}."
+        )
     content = content_source.get("content")
     if not isinstance(content, dict):
         return None
@@ -477,7 +483,7 @@ def fetch_previous_hashes(
     api_host: str,
     channel: str,
     ref: str,
-    post_types: list[str],
+    post_type: str,
     sender: str,
     current_item_hash: str,
     now_ms: int,
@@ -485,38 +491,37 @@ def fetch_previous_hashes(
     stale_cutoff_ms = now_ms - (STALE_RECORD_MAX_AGE_SECONDS * 1000)
     normalized_sender = normalize_address(sender)
     found: list[str] = []
-    for post_type in post_types:
-        for page in range(1, MAX_PREVIOUS_PAGES + 1):
-            url = (
-                f"{api_host.rstrip('/')}/api/v0/posts.json?"
-                f"channels={urllib.parse.quote(channel)}&"
-                f"refs={urllib.parse.quote(ref)}&"
-                f"types={urllib.parse.quote(post_type)}&"
-                f"pagination={PAGINATION}&page={page}"
-            )
-            payload = get_json(url)
-            posts = payload.get("posts")
-            if not isinstance(posts, list):
-                break
-
-            for entry in posts:
-                parsed = parse_post_record(entry)
-                if parsed is None:
-                    continue
-                same_publisher = normalized_sender in {
-                    normalize_address(parsed["sender"]),
-                    normalize_address(parsed["publisher_address"]),
-                }
-                if not same_publisher:
-                    continue
-                if parsed["item_hash"] == current_item_hash:
-                    continue
-                updated_at = timestamp_ms(parsed["updated_at"])
-                if updated_at is not None and updated_at < stale_cutoff_ms:
-                    found.append(str(parsed["item_hash"]))
-
-            if len(posts) < PAGINATION:
-                break
+    for page in range(1, MAX_PREVIOUS_PAGES + 1):
+        url = (
+            f"{api_host.rstrip('/')}/api/v0/posts.json?"
+            f"channels={urllib.parse.quote(channel)}&"
+            f"refs={urllib.parse.quote(ref)}&"
+            f"types={urllib.parse.quote(post_type)}&"
+            f"pagination={PAGINATION}&page={page}"
+        )
+        payload = get_json(url)
+        posts = payload.get("posts")
+        if not isinstance(posts, list):
+            break
+
+        for entry in posts:
+            parsed = parse_post_record(entry)
+            if parsed is None:
+                continue
+            same_publisher = normalized_sender in {
+                normalize_address(parsed["sender"]),
+                normalize_address(parsed["publisher_address"]),
+            }
+            if not same_publisher:
+                continue
+            if parsed["item_hash"] == current_item_hash:
+                continue
+            updated_at = timestamp_ms(parsed["updated_at"])
+            if updated_at is not None and updated_at < stale_cutoff_ms:
+                found.append(str(parsed["item_hash"]))
+
+        if len(posts) < PAGINATION:
+            break
 
     return dedupe(found)
 
@@ -580,18 +585,16 @@ def main() -> None:
     version = env_values.get("ALEPH_BOOTSTRAP_VERSION", "").strip() or None
     channel = env_values.get("ALEPH_BOOTSTRAP_CHANNEL", DEFAULT_CHANNEL).strip() or DEFAULT_CHANNEL
     ref = env_values.get("ALEPH_BOOTSTRAP_REF", DEFAULT_REF).strip() or DEFAULT_REF
-    post_type = env_values.get("ALEPH_BOOTSTRAP_POST_TYPE", DEFAULT_POST_TYPE).strip() or DEFAULT_POST_TYPE
+    post_type = env_values.get("ALEPH_BOOTSTRAP_POST_TYPE", POST_TYPE).strip() or POST_TYPE
+    if post_type != POST_TYPE:
+        raise RuntimeError(
+            f"Unsupported ALEPH_BOOTSTRAP_POST_TYPE: {post_type}. Expected {POST_TYPE}."
+        )
     api_host = env_values.get("ALEPH_BOOTSTRAP_API_HOST", DEFAULT_API_HOST).strip() or DEFAULT_API_HOST
-    compact = post_type == COMPACT_POST_TYPE
-    published_multiaddrs = (
-        select_compact_multiaddrs(browser_multiaddrs or multiaddrs)
-        if compact
-        else multiaddrs
-    )
-    published_browser_multiaddrs = [] if compact else browser_multiaddrs
+    published_multiaddrs = select_compact_multiaddrs(browser_multiaddrs or multiaddrs)
+    published_browser_multiaddrs: list[str] = []
     if not published_multiaddrs:
-        reason = "no public browser multiaddrs" if compact else "no public multiaddrs"
-        print(json_dumps({"status": "skipped", "reason": reason}))
+        print(json_dumps({"status": "skipped", "reason": "no public browser multiaddrs"}))
         return
 
     owner_authorization = load_owner_authorization(
@@ -646,7 +649,7 @@ def main() -> None:
         api_host,
         channel,
         ref,
-        [post_type, LEGACY_POST_TYPE] if compact else [post_type],
+        post_type,
         publisher_address,
         str(unsigned_message["item_hash"]),
         now_ms,

package/reference/uc-go-peer/rootfs/uc-go-peer-describe.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+from __future__ import annotations
+
 import json
 import os
 import re
@@ -48,6 +50,44 @@ def append_peer_id(addr: str, peer_id: str) -> str:
     return addr if "/p2p/" in addr else f"{addr}/p2p/{peer_id}"
 
 
+def browser_transport_suffixes(listening_addrs: list[str], transport: str) -> list[str]:
+    """Return dial-critical transport suffixes advertised by the live libp2p host.
+
+    WebTransport and WebRTC Direct addresses include a certificate hash generated
+    by libp2p.  Reconstructing these addresses from only the public IP and port
+    drops that hash and produces addresses browsers cannot dial.
+    """
+    marker = f"/{transport}/"
+    suffixes: list[str] = []
+    for addr in listening_addrs:
+        normalized = addr.lower()
+        marker_index = normalized.find(marker)
+        if marker_index < 0:
+            continue
+        suffix = addr[marker_index:]
+        if "/certhash/" not in suffix.lower():
+            continue
+        suffixes.append(suffix)
+    return dedupe(suffixes)
+
+
+def public_udp_multiaddrs(
+    public_ipv4: str,
+    public_ipv6: str,
+    udp_port: str,
+    suffixes: list[str],
+    peer_id: str,
+) -> list[str]:
+    result: list[str] = []
+    for suffix in suffixes:
+        suffix_with_peer = append_peer_id(suffix, peer_id)
+        if public_ipv4:
+            result.append(f"/ip4/{public_ipv4}/udp/{udp_port}{suffix_with_peer}")
+        if public_ipv6:
+            result.append(f"/ip6/{public_ipv6}/udp/{udp_port}{suffix_with_peer}")
+    return dedupe(result)
+
+
 def parse_logs() -> tuple[str | None, list[str]]:
     result = subprocess.run(
         ["journalctl", "-u", SERVICE_NAME, "-n", "500", "--no-pager"],
@@ -121,12 +161,24 @@ def build_probe_multiaddrs(env_values: dict[str, str], peer_id: str, listening_a
     public_ipv6 = env_values.get("PUBLIC_IPV6", "").strip()
     udp_port = env_values.get("EXTERNAL_RELAY_UDP_PORT", "").strip()
     if udp_port:
-        if public_ipv4:
-            webtransport_multiaddrs.append(f"/ip4/{public_ipv4}/udp/{udp_port}/quic-v1/webtransport/p2p/{peer_id}")
-            webrtc_direct_multiaddrs.append(f"/ip4/{public_ipv4}/udp/{udp_port}/webrtc-direct/p2p/{peer_id}")
-        if public_ipv6:
-            webtransport_multiaddrs.append(f"/ip6/{public_ipv6}/udp/{udp_port}/quic-v1/webtransport/p2p/{peer_id}")
-            webrtc_direct_multiaddrs.append(f"/ip6/{public_ipv6}/udp/{udp_port}/webrtc-direct/p2p/{peer_id}")
+        webtransport_multiaddrs.extend(
+            public_udp_multiaddrs(
+                public_ipv4,
+                public_ipv6,
+                udp_port,
+                browser_transport_suffixes(listening_addrs, "quic-v1/webtransport"),
+                peer_id,
+            )
+        )
+        webrtc_direct_multiaddrs.extend(
+            public_udp_multiaddrs(
+                public_ipv4,
+                public_ipv6,
+                udp_port,
+                browser_transport_suffixes(listening_addrs, "webrtc-direct"),
+                peer_id,
+            )
+        )
 
     probe_multiaddrs.extend(direct_tcp_multiaddrs)
     probe_multiaddrs.extend(autotls_multiaddrs)